Module Name: src Committed By: riz Date: Mon Jun 14 19:02:06 UTC 2010
Modified Files: src/sys/dev/usb: usbdevs.h usbdevs_data.h Log Message: Regen for Sierra Wireless USB 305 and sorting change. To generate a diff of this commit: cvs rdiff -u -r1.549 -r1.550 src/sys/dev/usb/usbdevs.h cvs rdiff -u -r1.550 -r1.551 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.549 src/sys/dev/usb/usbdevs.h:1.550 --- src/sys/dev/usb/usbdevs.h:1.549 Sun Jun 13 02:36:18 2010 +++ src/sys/dev/usb/usbdevs.h Mon Jun 14 19:02:06 2010 @@ -1,10 +1,10 @@ -/* $NetBSD: usbdevs.h,v 1.549 2010/06/13 02:36:18 tsutsui Exp $ */ +/* $NetBSD: usbdevs.h,v 1.550 2010/06/14 19:02:06 riz Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * NetBSD: usbdevs,v 1.555 2010/06/13 02:33:54 tsutsui Exp + * NetBSD: usbdevs,v 1.557 2010/06/14 18:57:49 riz Exp */ /* @@ -2174,22 +2174,17 @@ #define USB_PRODUCT_SIEMENS2_WL54G 0x3c06 /* 54g USB Network Adapter */ /* Sierra Wireless products */ -#define USB_PRODUCT_SIERRA_AIRCARD580 0x0112 /* Sierra Wireless AirCard 580 */ +#define USB_PRODUCT_SIERRA_EM5625 0x0017 /* EM5625 */ +#define USB_PRODUCT_SIERRA_MC5720_2 0x0018 /* MC5720 */ #define USB_PRODUCT_SIERRA_AIRCARD595 0x0019 /* Sierra Wireless AirCard 595 */ -#define USB_PRODUCT_SIERRA_AC595U 0x0120 /* Sierra Wireless AirCard 595U */ +#define USB_PRODUCT_SIERRA_MC5725 0x0020 /* MC5725 */ #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_AIRCARD580 0x0112 /* Sierra Wireless AirCard 580 */ +#define USB_PRODUCT_SIERRA_AC595U 0x0120 /* Sierra Wireless AirCard 595U */ #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_INSTALLER 0x0fff /* Aircard Driver Installer */ #define USB_PRODUCT_SIERRA_MC8755_2 0x6802 /* MC8755 */ #define USB_PRODUCT_SIERRA_MC8765 0x6803 /* MC8765 */ #define USB_PRODUCT_SIERRA_MC8755 0x6804 /* MC8755 */ @@ -2199,7 +2194,13 @@ #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_INSTALLER 0x0fff /* Aircard Driver Installer */ +#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_USB305 0x68a3 /* Sierra Wireless AirCard USB 305 */ /* Sigmatel products */ #define USB_PRODUCT_SIGMATEL_SIR4116 0x4116 /* StIR4116 SIR */ Index: src/sys/dev/usb/usbdevs_data.h diff -u src/sys/dev/usb/usbdevs_data.h:1.550 src/sys/dev/usb/usbdevs_data.h:1.551 --- src/sys/dev/usb/usbdevs_data.h:1.550 Sun Jun 13 02:36:18 2010 +++ src/sys/dev/usb/usbdevs_data.h Mon Jun 14 19:02:06 2010 @@ -1,10 +1,10 @@ -/* $NetBSD: usbdevs_data.h,v 1.550 2010/06/13 02:36:18 tsutsui Exp $ */ +/* $NetBSD: usbdevs_data.h,v 1.551 2010/06/14 19:02:06 riz Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * NetBSD: usbdevs,v 1.555 2010/06/13 02:33:54 tsutsui Exp + * NetBSD: usbdevs,v 1.557 2010/06/14 18:57:49 riz Exp */ /* @@ -6319,16 +6319,20 @@ "54g USB Network Adapter", }, { - USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AIRCARD580, - "Sierra Wireless AirCard 580", + USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_EM5625, + "EM5625", + }, + { + USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC5720_2, + "MC5720", }, { USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AIRCARD595, "Sierra Wireless AirCard 595", }, { - USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC595U, - "Sierra Wireless AirCard 595U", + USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC5725, + "MC5725", }, { USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC597E, @@ -6339,50 +6343,26 @@ "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_AIRCARD580, + "Sierra Wireless AirCard 580", }, { - USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_EM5625, - "EM5625", + USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC595U, + "Sierra Wireless AirCard 595U", }, { 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_INSTALLER, + "Aircard Driver Installer", + }, + { USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC8755_2, "MC8755", }, @@ -6419,8 +6399,32 @@ "MC8781", }, { - USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_INSTALLER, - "Aircard Driver Installer", + 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_USB305, + "Sierra Wireless AirCard USB 305", }, { USB_VENDOR_SIGMATEL, USB_PRODUCT_SIGMATEL_SIR4116, @@ -7295,4 +7299,4 @@ "Prestige", }, }; -const int usb_nproducts = 1342; +const int usb_nproducts = 1343;