From 5519d99b9a30a73abb9b0725747ddc9d5e2d5612 Mon Sep 17 00:00:00 2001 From: joerg Date: Sun, 19 Oct 2008 11:37:44 +0000 Subject: [PATCH] Regen. --- sys/dev/usb/usbdevs.h | 39 ++++++++++--- sys/dev/usb/usbdevs_data.h | 112 ++++++++++++++++++++++++++++++++----- 2 files changed, 129 insertions(+), 22 deletions(-) diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h index 83b9b4fe65a6..928e87358b26 100644 --- a/sys/dev/usb/usbdevs.h +++ b/sys/dev/usb/usbdevs.h @@ -1,10 +1,10 @@ -/* $NetBSD: usbdevs.h,v 1.510 2008/10/10 23:53:19 jakllsch Exp $ */ +/* $NetBSD: usbdevs.h,v 1.511 2008/10/19 11:37:44 joerg Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * NetBSD: usbdevs,v 1.515 2008/10/10 23:50:39 jakllsch Exp + * NetBSD: usbdevs,v 1.516 2008/10/19 11:36:11 joerg Exp */ /* @@ -454,6 +454,7 @@ #define USB_VENDOR_PHISON 0x13fe /* Phison Electronics Corp. */ #define USB_VENDOR_NOVATEL2 0x1410 /* Novatel */ #define USB_VENDOR_OMNIVISION2 0x1415 /* OmniVision Technologies, Inc. */ +#define USB_VENDOR_MERLIN 0x1416 /* Merlin */ #define USB_VENDOR_WISTRONNEWEB 0x1435 /* Wistron NeWeb */ #define USB_VENDOR_HUAWEI3COM 0x1472 /* Huawei-3Com */ #define USB_VENDOR_SILICOM 0x1485 /* Silicom */ @@ -480,6 +481,7 @@ #define USB_VENDOR_AMIT 0x18c5 /* AMIT */ #define USB_VENDOR_QCOM 0x18e8 /* Qcom */ #define USB_VENDOR_LINKSYS3 0x1915 /* Linksys */ +#define USB_VENDOR_QUALCOMMINC 0x19d2 /* Qualcomm, Incorporated */ #define USB_VENDOR_DLINK 0x2001 /* D-Link */ #define USB_VENDOR_PLANEX2 0x2019 /* Planex Communications */ #define USB_VENDOR_ERICSSON 0x2282 /* Ericsson */ @@ -1501,6 +1503,9 @@ #define USB_PRODUCT_MELCO_G54HP 0x00d9 /* WLI-U2-G54HP */ #define USB_PRODUCT_MELCO_KG54L 0x00da /* WLI-U2-KG54L */ +/* Merlin products */ +#define USB_PRODUCT_MERLIN_V620 0x1110 /* Merlin V620 */ + /* MetaGeek products */ #define USB_PRODUCT_METAGEEK_WISPY_24X 0x083f /* Wi-Spy 2.4x */ @@ -1681,9 +1686,13 @@ #define USB_PRODUCT_NOVATEL_FLEXPACKGPS 0x0100 /* NovAtel FlexPack GPS receiver */ #define USB_PRODUCT_NOVATEL2_EXPRESSCARD 0x1100 /* ExpressCard 3G */ #define USB_PRODUCT_NOVATEL2_MERLINV620 0x1110 /* Novatel Wireless Merlin CDMA */ +#define USB_PRODUCT_NOVATEL2_V740 0x1120 /* Merlin V740 */ #define USB_PRODUCT_NOVATEL2_S720 0x1130 /* S720 */ #define USB_PRODUCT_NOVATEL2_MERLINU740 0x1400 /* Novatel Merlin U740 */ +#define USB_PRODUCT_NOVATEL2_U740_2 0x1410 /* Merlin U740 */ +#define USB_PRODUCT_NOVATEL2_U870 0x1420 /* Merlin U870 */ #define USB_PRODUCT_NOVATEL2_XU870 0x1430 /* XU870 */ +#define USB_PRODUCT_NOVATEL2_X950D 0x1450 /* Merlin X950D */ #define USB_PRODUCT_NOVATEL2_ES620 0x2100 /* ES620 CDMA */ #define USB_PRODUCT_NOVATEL2_U720 0x2110 /* U720 */ #define USB_PRODUCT_NOVATEL2_U727 0x4100 /* U727 */ @@ -1714,12 +1723,12 @@ #define USB_PRODUCT_ONSPEC2_8IN2 0xb012 /* 8In2 */ /* Option N.V. products */ -#define USB_PRODUCT_OPTIONNV_VODAFONEMC3G 0x5000 /* Vodafone Mobile Connect 3G datacard */ -#define USB_PRODUCT_OPTIONNV_MC3G 0x5000 /* Mobile Connect 3G datacard */ +#define USB_PRODUCT_OPTIONNV_MC3G 0x5000 /* Vodafone Mobile Connect 3G datacard */ #define USB_PRODUCT_OPTIONNV_QUADUMTS2 0x6000 /* GlobeTrotter Fusion Quad Lite UMTS/GPRS */ #define USB_PRODUCT_OPTIONNV_QUADUMTS 0x6300 /* GlobeTrotter Fusion Quad Lite 3D */ #define USB_PRODUCT_OPTIONNV_QUADPLUSUMTS 0x6600 /* GlobeTrotter 3G Quad Plus */ #define USB_PRODUCT_OPTIONNV_HSDPA 0x6701 /* GlobeTrotter HSDPA Modem */ +#define USB_PRODUCT_OPTIONNV_GTMAXHSUPA 0x7001 /* GlobeTrotter HSUPA */ /* OQO */ #define USB_PRODUCT_OQO_WIFI01 0x0002 /* model 01 WiFi interface */ @@ -1874,6 +1883,7 @@ #define USB_PRODUCT_QUALCOMM_CDMA_MSM 0x6000 /* CDMA Technologies MSM phone */ #define USB_PRODUCT_QUALCOMM_MSM_HSDPA 0x6613 /* HSDPA MSM */ #define USB_PRODUCT_QUALCOMM2_CDMA_MSM 0x3196 /* CDMA Technologies MSM modem */ +#define USB_PRODUCT_QUALCOMMINC_CDMA_MSM 0x0001 /* CDMA Technologies MSM modem */ /* Qualcomm Kyocera products */ #define USB_PRODUCT_QUALCOMM_K_CDMA_MSM_K 0x17da /* Qualcomm Kyocera CDMA Technologies MSM */ @@ -2029,16 +2039,29 @@ /* Sierra Wireless products */ #define USB_PRODUCT_SIERRA_AIRCARD580 0x0112 /* Sierra Wireless AirCard 580 */ #define USB_PRODUCT_SIERRA_AIRCARD595 0x0019 /* Sierra Wireless AirCard 595 */ -#define USB_PRODUCT_SIERRA_MINI5725 0x0220 /* Sierra Wireless miniPCI 5275 */ +#define USB_PRODUCT_SIERRA_AC595U 0x0120 /* Sierra Wireless AirCard 595U */ +#define USB_PRODUCT_SIERRA_AC597E 0x0021 /* Sierra Wireless AirCard 597E */ +#define USB_PRODUCT_SIERRA_C597 0x0023 /* Sierra Wireless Compass 597 */ +#define USB_PRODUCT_SIERRA_AC880 0x6850 /* Sierra Wireless AirCard 880 */ +#define USB_PRODUCT_SIERRA_AC881 0x6851 /* Sierra Wireless AirCard 881 */ +#define USB_PRODUCT_SIERRA_AC880E 0x6852 /* Sierra Wireless AirCard 880E */ +#define USB_PRODUCT_SIERRA_AC881E 0x6853 /* Sierra Wireless AirCard 881E */ +#define USB_PRODUCT_SIERRA_AC880U 0x6855 /* Sierra Wireless AirCard 880U */ +#define USB_PRODUCT_SIERRA_AC881U 0x6856 /* Sierra Wireless AirCard 881U */ #define USB_PRODUCT_SIERRA_EM5625 0x0017 /* EM5625 */ -#define USB_PRODUCT_SIERRA_MC5720 0x0018 /* MC5720 */ +#define USB_PRODUCT_SIERRA_MC5720 0x0218 /* MC5720 Wireless Modem */ +#define USB_PRODUCT_SIERRA_MC5720_2 0x0018 /* MC5720 */ #define USB_PRODUCT_SIERRA_MC5725 0x0020 /* MC5725 */ +#define USB_PRODUCT_SIERRA_MINI5725 0x0220 /* Sierra Wireless miniPCI 5275 */ #define USB_PRODUCT_SIERRA_MC8755_2 0x6802 /* MC8755 */ #define USB_PRODUCT_SIERRA_MC8765 0x6803 /* MC8765 */ -#define USB_PRODUCT_SIERRA_MC8755 0x6804 /* MC8755 HSDPA */ -#define USB_PRODUCT_SIERRA_MC8775 0x6812 /* MC8775 HSDPA */ +#define USB_PRODUCT_SIERRA_MC8755 0x6804 /* MC8755 */ +#define USB_PRODUCT_SIERRA_AC875U 0x6812 /* AC875U HSDPA USB Modem */ #define USB_PRODUCT_SIERRA_MC8755_3 0x6813 /* MC8755 HSDPA */ +#define USB_PRODUCT_SIERRA_MC8775_2 0x6815 /* MC8775 */ #define USB_PRODUCT_SIERRA_AIRCARD875 0x6820 /* Aircard 875 HSDPA */ +#define USB_PRODUCT_SIERRA_MC8780 0x6832 /* MC8780 */ +#define USB_PRODUCT_SIERRA_MC8781 0x6833 /* MC8781 */ /* Sigmatel products */ #define USB_PRODUCT_SIGMATEL_SIR4116 0x4116 /* StIR4116 SIR */ diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h index 80385013e842..4b73a95a0d91 100644 --- a/sys/dev/usb/usbdevs_data.h +++ b/sys/dev/usb/usbdevs_data.h @@ -1,10 +1,10 @@ -/* $NetBSD: usbdevs_data.h,v 1.511 2008/10/10 23:53:19 jakllsch Exp $ */ +/* $NetBSD: usbdevs_data.h,v 1.512 2008/10/19 11:37:44 joerg Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * NetBSD: usbdevs,v 1.515 2008/10/10 23:50:39 jakllsch Exp + * NetBSD: usbdevs,v 1.516 2008/10/19 11:36:11 joerg Exp */ /* @@ -1610,6 +1610,10 @@ const struct usb_vendor usb_vendors[] = { USB_VENDOR_OMNIVISION2, "OmniVision Technologies, Inc.", }, + { + USB_VENDOR_MERLIN, + "Merlin", + }, { USB_VENDOR_WISTRONNEWEB, "Wistron NeWeb", @@ -1714,6 +1718,10 @@ const struct usb_vendor usb_vendors[] = { USB_VENDOR_LINKSYS3, "Linksys", }, + { + USB_VENDOR_QUALCOMMINC, + "Qualcomm, Incorporated", + }, { USB_VENDOR_DLINK, "D-Link", @@ -1843,7 +1851,7 @@ const struct usb_vendor usb_vendors[] = { "GNU Radio USRP", }, }; -const int usb_nvendors = 451; +const int usb_nvendors = 453; const struct usb_product usb_products[] = { { @@ -4438,6 +4446,10 @@ const struct usb_product usb_products[] = { USB_VENDOR_MELCO, USB_PRODUCT_MELCO_KG54L, "WLI-U2-KG54L", }, + { + USB_VENDOR_MERLIN, USB_PRODUCT_MERLIN_V620, + "Merlin V620", + }, { USB_VENDOR_METAGEEK, USB_PRODUCT_METAGEEK_WISPY_24X, "Wi-Spy 2.4x", @@ -4910,6 +4922,10 @@ const struct usb_product usb_products[] = { USB_VENDOR_NOVATEL2, USB_PRODUCT_NOVATEL2_MERLINV620, "Novatel Wireless Merlin CDMA", }, + { + USB_VENDOR_NOVATEL2, USB_PRODUCT_NOVATEL2_V740, + "Merlin V740", + }, { USB_VENDOR_NOVATEL2, USB_PRODUCT_NOVATEL2_S720, "S720", @@ -4918,10 +4934,22 @@ const struct usb_product usb_products[] = { USB_VENDOR_NOVATEL2, USB_PRODUCT_NOVATEL2_MERLINU740, "Novatel Merlin U740", }, + { + USB_VENDOR_NOVATEL2, USB_PRODUCT_NOVATEL2_U740_2, + "Merlin U740", + }, + { + USB_VENDOR_NOVATEL2, USB_PRODUCT_NOVATEL2_U870, + "Merlin U870", + }, { USB_VENDOR_NOVATEL2, USB_PRODUCT_NOVATEL2_XU870, "XU870", }, + { + USB_VENDOR_NOVATEL2, USB_PRODUCT_NOVATEL2_X950D, + "Merlin X950D", + }, { USB_VENDOR_NOVATEL2, USB_PRODUCT_NOVATEL2_ES620, "ES620 CDMA", @@ -5006,13 +5034,9 @@ const struct usb_product usb_products[] = { USB_VENDOR_ONSPEC2, USB_PRODUCT_ONSPEC2_8IN2, "8In2", }, - { - USB_VENDOR_OPTIONNV, USB_PRODUCT_OPTIONNV_VODAFONEMC3G, - "Vodafone Mobile Connect 3G datacard", - }, { USB_VENDOR_OPTIONNV, USB_PRODUCT_OPTIONNV_MC3G, - "Mobile Connect 3G datacard", + "Vodafone Mobile Connect 3G datacard", }, { USB_VENDOR_OPTIONNV, USB_PRODUCT_OPTIONNV_QUADUMTS2, @@ -5030,6 +5054,10 @@ const struct usb_product usb_products[] = { USB_VENDOR_OPTIONNV, USB_PRODUCT_OPTIONNV_HSDPA, "GlobeTrotter HSDPA Modem", }, + { + USB_VENDOR_OPTIONNV, USB_PRODUCT_OPTIONNV_GTMAXHSUPA, + "GlobeTrotter HSUPA", + }, { USB_VENDOR_OQO, USB_PRODUCT_OQO_WIFI01, "model 01 WiFi interface", @@ -5446,6 +5474,10 @@ const struct usb_product usb_products[] = { USB_VENDOR_QUALCOMM2, USB_PRODUCT_QUALCOMM2_CDMA_MSM, "CDMA Technologies MSM modem", }, + { + USB_VENDOR_QUALCOMMINC, USB_PRODUCT_QUALCOMMINC_CDMA_MSM, + "CDMA Technologies MSM modem", + }, { USB_VENDOR_QUALCOMM_K, USB_PRODUCT_QUALCOMM_K_CDMA_MSM_K, "Qualcomm Kyocera CDMA Technologies MSM", @@ -5859,8 +5891,40 @@ const struct usb_product usb_products[] = { "Sierra Wireless AirCard 595", }, { - USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MINI5725, - "Sierra Wireless miniPCI 5275", + USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC595U, + "Sierra Wireless AirCard 595U", + }, + { + USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC597E, + "Sierra Wireless AirCard 597E", + }, + { + USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_C597, + "Sierra Wireless Compass 597", + }, + { + USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC880, + "Sierra Wireless AirCard 880", + }, + { + USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC881, + "Sierra Wireless AirCard 881", + }, + { + USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC880E, + "Sierra Wireless AirCard 880E", + }, + { + USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC881E, + "Sierra Wireless AirCard 881E", + }, + { + USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC880U, + "Sierra Wireless AirCard 880U", + }, + { + USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC881U, + "Sierra Wireless AirCard 881U", }, { USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_EM5625, @@ -5868,12 +5932,20 @@ const struct usb_product usb_products[] = { }, { USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC5720, + "MC5720 Wireless Modem", + }, + { + USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC5720_2, "MC5720", }, { USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC5725, "MC5725", }, + { + USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MINI5725, + "Sierra Wireless miniPCI 5275", + }, { USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC8755_2, "MC8755", @@ -5884,20 +5956,32 @@ const struct usb_product usb_products[] = { }, { USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC8755, - "MC8755 HSDPA", + "MC8755", }, { - USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC8775, - "MC8775 HSDPA", + USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC875U, + "AC875U HSDPA USB Modem", }, { USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC8755_3, "MC8755 HSDPA", }, + { + USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC8775_2, + "MC8775", + }, { USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AIRCARD875, "Aircard 875 HSDPA", }, + { + USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC8780, + "MC8780", + }, + { + USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC8781, + "MC8781", + }, { USB_VENDOR_SIGMATEL, USB_PRODUCT_SIGMATEL_SIR4116, "StIR4116 SIR", @@ -6719,4 +6803,4 @@ const struct usb_product usb_products[] = { "Prestige", }, }; -const int usb_nproducts = 1218; +const int usb_nproducts = 1237;