From owner-p4-projects@FreeBSD.ORG Sun Sep 14 16:34:02 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 704C01065678; Sun, 14 Sep 2008 16:34:02 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3460D1065671 for ; Sun, 14 Sep 2008 16:34:02 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1467F8FC15 for ; Sun, 14 Sep 2008 16:34:02 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8EGY1qJ019348 for ; Sun, 14 Sep 2008 16:34:01 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8EGY10K019345 for perforce@freebsd.org; Sun, 14 Sep 2008 16:34:01 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 14 Sep 2008 16:34:01 GMT Message-Id: <200809141634.m8EGY10K019345@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 149760 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Sep 2008 16:34:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=149760 Change 149760 by hselasky@hselasky_laptop001 on 2008/09/14 16:33:18 Update pre-generated device ID and device Table header files. Whenever usbdevs is changed you should also do a "make all" in sys/dev/usb2/include . Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devid.h#7 edit .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devtable.h#7 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_devid.h#7 (text+ko) ==== @@ -1440,6 +1440,7 @@ /* HUAWEI products */ #define USB_PRODUCT_HUAWEI_MOBILE 0x1001 /* Huawei Mobile */ +#define USB_PRODUCT_HUAWEI_E270 0x1003 /* Huawei HSPA modem */ /* HUAWEI 3com products */ #define USB_PRODUCT_HUAWEI3COM_WUB320G 0x0009 /* Aolynk WUB320g */ @@ -1663,6 +1664,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_WISPY1B 0x083e /* MetaGeek Wi-Spy */ #define USB_PRODUCT_METAGEEK_WISPY24X 0x083f /* MetaGeek Wi-Spy 2.4x */ @@ -1828,13 +1832,21 @@ #define USB_PRODUCT_NOVATECH_RT2573 0x9021 /* RT2573 */ /* Novatel Wireless products */ +#define USB_PRODUCT_NOVATEL_V640 0x1100 /* Merlin V620 */ #define USB_PRODUCT_NOVATEL_CDMA_MODEM 0x1110 /* Novatel Wireless Merlin CDMA */ #define USB_PRODUCT_NOVATEL_V620 0x1110 /* Merlin V620 */ #define USB_PRODUCT_NOVATEL_V740 0x1120 /* Merlin V740 */ #define USB_PRODUCT_NOVATEL_V720 0x1130 /* Merlin V720 */ #define USB_PRODUCT_NOVATEL_U740 0x1400 /* Merlin U740 */ +#define USB_PRODUCT_NOVATEL_U740_2 0x1410 /* Merlin U740 */ +#define USB_PRODUCT_NOVATEL_U870 0x1420 /* Merlin U870 */ +#define USB_PRODUCT_NOVATEL_XU870 0x1430 /* Merlin XU870 */ +#define USB_PRODUCT_NOVATEL_X950D 0x1450 /* Merlin X950D */ +#define USB_PRODUCT_NOVATEL_ES620 0x2100 /* ES620 CDMA */ #define USB_PRODUCT_NOVATEL_U720 0x2110 /* Merlin U720 */ #define USB_PRODUCT_NOVATEL_U727 0x4100 /* Merlin U727 CDMA */ +#define USB_PRODUCT_NOVATEL_U950D 0x4400 /* Novatel MC950D HSUPA */ +#define USB_PRODUCT_NOVATEL_ZEROCD 0x5010 /* Novatel ZeroCD */ #define USB_PRODUCT_NOVATEL2_FLEXPACKGPS 0x0100 /* NovAtel FlexPack GPS receiver */ /* Merlin products */ @@ -2107,9 +2119,31 @@ /* 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_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 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 */ #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 */ +#define USB_PRODUCT_SIERRA_TRUINSTALL 0x0fff /* Aircard Tru Installer */ /* Sigmatel products */ #define USB_PRODUCT_SIGMATEL_I_BEAD100 0x8008 /* i-Bead 100 MP3 Player */ ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_devtable.h#7 (text+ko) ==== @@ -3137,6 +3137,12 @@ "Huawei Mobile", }, { + USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_E270, + 0, + "Huawei Technologies", + "Huawei HSPA modem", + }, + { USB_VENDOR_HUAWEI3COM, USB_PRODUCT_HUAWEI3COM_WUB320G, 0, "Huawei-3Com", @@ -4037,6 +4043,12 @@ "WLI-U2-KG54L", }, { + USB_VENDOR_MERLIN, USB_PRODUCT_MERLIN_V620, + 0, + "Merlin", + "Merlin V620", + }, + { USB_VENDOR_METAGEEK, USB_PRODUCT_METAGEEK_WISPY1B, 0, "MetaGeek", @@ -4685,6 +4697,12 @@ "RT2573", }, { + USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_V640, + 0, + "Novatel Wireless", + "Merlin V620", + }, + { USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_CDMA_MODEM, 0, "Novatel Wireless", @@ -4715,6 +4733,36 @@ "Merlin U740", }, { + USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_U740_2, + 0, + "Novatel Wireless", + "Merlin U740", + }, + { + USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_U870, + 0, + "Novatel Wireless", + "Merlin U870", + }, + { + USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_XU870, + 0, + "Novatel Wireless", + "Merlin XU870", + }, + { + USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_X950D, + 0, + "Novatel Wireless", + "Merlin X950D", + }, + { + USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_ES620, + 0, + "Novatel Wireless", + "ES620 CDMA", + }, + { USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_U720, 0, "Novatel Wireless", @@ -4727,6 +4775,18 @@ "Merlin U727 CDMA", }, { + USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_U950D, + 0, + "Novatel Wireless", + "Novatel MC950D HSUPA", + }, + { + USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_ZEROCD, + 0, + "Novatel Wireless", + "Novatel ZeroCD", + }, + { USB_VENDOR_NOVATEL2, USB_PRODUCT_NOVATEL2_FLEXPACKGPS, 0, "Novatel Wireless", @@ -5801,12 +5861,114 @@ "Sierra Wireless AirCard 580", }, { + USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AIRCARD595, + 0, + "Sierra Wireless", + "Sierra Wireless AirCard 595", + }, + { + USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC595U, + 0, + "Sierra Wireless", + "Sierra Wireless AirCard 595U", + }, + { + USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC597E, + 0, + "Sierra Wireless", + "Sierra Wireless AirCard 597E", + }, + { + USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_C597, + 0, + "Sierra Wireless", + "Sierra Wireless Compass 597", + }, + { + USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC880, + 0, + "Sierra Wireless", + "Sierra Wireless AirCard 880", + }, + { + USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC881, + 0, + "Sierra Wireless", + "Sierra Wireless AirCard 881", + }, + { + USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC880E, + 0, + "Sierra Wireless", + "Sierra Wireless AirCard 880E", + }, + { + USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC881E, + 0, + "Sierra Wireless", + "Sierra Wireless AirCard 881E", + }, + { + USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC880U, + 0, + "Sierra Wireless", + "Sierra Wireless AirCard 880U", + }, + { + USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC881U, + 0, + "Sierra Wireless", + "Sierra Wireless AirCard 881U", + }, + { + USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_EM5625, + 0, + "Sierra Wireless", + "EM5625", + }, + { USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC5720, 0, "Sierra Wireless", "MC5720 Wireless Modem", }, { + USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC5720_2, + 0, + "Sierra Wireless", + "MC5720", + }, + { + USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC5725, + 0, + "Sierra Wireless", + "MC5725", + }, + { + USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MINI5725, + 0, + "Sierra Wireless", + "Sierra Wireless miniPCI 5275", + }, + { + USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC8755_2, + 0, + "Sierra Wireless", + "MC8755", + }, + { + USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC8765, + 0, + "Sierra Wireless", + "MC8765", + }, + { + USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC8755, + 0, + "Sierra Wireless", + "MC8755", + }, + { USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC875U, 0, "Sierra Wireless", @@ -5819,6 +5981,36 @@ "MC8755 HSDPA", }, { + USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC8775_2, + 0, + "Sierra Wireless", + "MC8775", + }, + { + USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AIRCARD875, + 0, + "Sierra Wireless", + "Aircard 875 HSDPA", + }, + { + USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC8780, + 0, + "Sierra Wireless", + "MC8780", + }, + { + USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC8781, + 0, + "Sierra Wireless", + "MC8781", + }, + { + USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_TRUINSTALL, + 0, + "Sierra Wireless", + "Aircard Tru Installer", + }, + { USB_VENDOR_SIGMATEL, USB_PRODUCT_SIGMATEL_I_BEAD100, 0, "Sigmatel",