From owner-svn-src-all@FreeBSD.ORG Fri Dec 12 21:57:17 2008 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 05681106564A; Fri, 12 Dec 2008 21:57:17 +0000 (UTC) (envelope-from thompsa@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E94BA8FC1A; Fri, 12 Dec 2008 21:57:16 +0000 (UTC) (envelope-from thompsa@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mBCLvGC3009572; Fri, 12 Dec 2008 21:57:16 GMT (envelope-from thompsa@svn.freebsd.org) Received: (from thompsa@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id mBCLvGRP009570; Fri, 12 Dec 2008 21:57:16 GMT (envelope-from thompsa@svn.freebsd.org) Message-Id: <200812122157.mBCLvGRP009570@svn.freebsd.org> From: Andrew Thompson Date: Fri, 12 Dec 2008 21:57:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r186001 - head/sys/dev/usb2/include X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Dec 2008 21:57:17 -0000 Author: thompsa Date: Fri Dec 12 21:57:16 2008 New Revision: 186001 URL: http://svn.freebsd.org/changeset/base/186001 Log: It seems usb2 needs the devtable regenerated after editing usbdevs. Modified: head/sys/dev/usb2/include/usb2_devid.h head/sys/dev/usb2/include/usb2_devtable.h Modified: head/sys/dev/usb2/include/usb2_devid.h ============================================================================== --- head/sys/dev/usb2/include/usb2_devid.h Fri Dec 12 21:45:10 2008 (r186000) +++ head/sys/dev/usb2/include/usb2_devid.h Fri Dec 12 21:57:16 2008 (r186001) @@ -4,7 +4,7 @@ * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * FreeBSD: src/sys/dev/usb/usbdevs,v 1.383 2008/11/12 13:58:59 keramida Exp + * FreeBSD: head/sys/dev/usb/usbdevs 185998 2008-12-12 18:34:27Z thompsa */ /* $NetBSD: usbdevs,v 1.392 2004/12/29 08:38:44 imp Exp $ */ @@ -212,7 +212,7 @@ #define USB_VENDOR_NEWNEX 0x04f7 /* Newnex */ #define USB_VENDOR_BROTHER 0x04f9 /* Brother Industries */ #define USB_VENDOR_DALLAS 0x04fa /* Dallas Semiconductor */ -#define USB_VENDOR_SUNPLUS 0x04fc /* Sunplus */ +#define USB_VENDOR_AIPTEK2 0x04fc /* AIPTEK International */ #define USB_VENDOR_PFU 0x04fe /* PFU */ #define USB_VENDOR_FUJIKURA 0x0501 /* Fujikura/DDK */ #define USB_VENDOR_ACER 0x0502 /* Acer */ @@ -510,7 +510,7 @@ #define USB_VENDOR_FSC 0x0bf8 /* Fujitsu Siemens Computers */ #define USB_VENDOR_AGATE 0x0c08 /* Agate Technologies */ #define USB_VENDOR_DMI 0x0c0b /* DMI */ -#define USB_VENDOR_MICRODIA 0x0c45 /* Chicony */ +#define USB_VENDOR_CHICONY2 0x0c45 /* Chicony */ #define USB_VENDOR_SEALEVEL 0x0c52 /* Sealevel System */ #define USB_VENDOR_LUWEN 0x0c76 /* Luwen */ #define USB_VENDOR_KYOCERA2 0x0c88 /* Kyocera Wireless Corp. */ @@ -627,6 +627,7 @@ #define USB_VENDOR_QCOM 0x18e8 /* Qcom */ #define USB_VENDOR_LINKSYS3 0x1915 /* Linksys */ #define USB_VENDOR_QUALCOMMINC 0x19d2 /* Qualcomm, Incorporated */ +#define USB_VENDOR_STELERA 0x1a8d /* Stelera Wireless */ #define USB_VENDOR_DLINK 0x2001 /* D-Link */ #define USB_VENDOR_PLANEX2 0x2019 /* Planex Communications */ #define USB_VENDOR_ERICSSON 0x2282 /* Ericsson */ @@ -802,7 +803,7 @@ /* AIPTEK products */ #define USB_PRODUCT_AIPTEK_POCKETCAM3M 0x2011 /* PocketCAM 3Mega */ -#define USB_PRODUCT_SUNPLUS_PENCAM_MEGA_1_3 0x504a /* PenCam Mega 1.3 */ +#define USB_PRODUCT_AIPTEK2_PENCAM_MEGA_1_3 0x504a /* PenCam Mega 1.3 */ /* AirPrime products */ #define USB_PRODUCT_AIRPRIME_PC5220 0x0112 /* CDMA Wireless PC Card */ @@ -1014,7 +1015,7 @@ /* Chicony products */ #define USB_PRODUCT_CHICONY_KB8933 0x0001 /* KB-8933 keyboard */ -#define USB_PRODUCT_MICRODIA_TWINKLECAM 0x600d /* TwinkleCam USB camera */ +#define USB_PRODUCT_CHICONY2_TWINKLECAM 0x600d /* TwinkleCam USB camera */ /* CH Products */ #define USB_PRODUCT_CHPRODUCTS_PROTHROTTLE 0x00f1 /* Pro Throttle */ @@ -1436,6 +1437,7 @@ #define USB_PRODUCT_HP_OJ4215 0x3d11 /* OfficeJet 4215 */ #define USB_PRODUCT_HP_HN210E 0x811c /* Ethernet HN210E */ #define USB_PRODUCT_HP2_C500 0x6002 /* PhotoSmart C500 */ +#define USB_PRODUCT_HP_HS2300 0x1e1d /* hs2300 HSDPA (aka MC8775) */ /* HTC products */ #define USB_PRODUCT_HTC_WINMOBILE 0x00ce /* HTC USB Sync */ @@ -1693,9 +1695,6 @@ #define USB_PRODUCT_MSI_RT2573_3 0xa861 /* RT2573 */ #define USB_PRODUCT_MSI_RT2573_4 0xa874 /* RT2573 */ -/* Microdia products */ -#define USB_PRODUCT_MICRODIA_TWINKLECAM 0x600d /* TwinkleCam USB camera */ - /* Microsoft products */ #define USB_PRODUCT_MICROSOFT_SIDEPREC 0x0008 /* SideWinder Precision Pro */ #define USB_PRODUCT_MICROSOFT_INTELLIMOUSE 0x0009 /* IntelliMouse */ @@ -1882,6 +1881,7 @@ #define USB_PRODUCT_OPTION_GT3G 0x6000 /* GlobeTrotter 3G datacard */ #define USB_PRODUCT_OPTION_GT3GQUAD 0x6300 /* GlobeTrotter 3G QUAD datacard */ #define USB_PRODUCT_OPTION_GT3GPLUS 0x6600 /* GlobeTrotter 3G+ datacard */ +#define USB_PRODUCT_OPTION_GTICON322 0xd033 /* GlobeTrotter Icon322 storage */ #define USB_PRODUCT_OPTION_GTMAX36 0x6701 /* GlobeTrotter Max 3.6 Modem */ #define USB_PRODUCT_OPTION_GTMAXHSUPA 0x7001 /* GlobeTrotter HSUPA */ @@ -2131,12 +2131,14 @@ #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_AC875 0x6820 /* Sierra Wireless AirCard 875 */ #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_AC885U 0x6880 /* Sierra Wireless AirCard 885U */ #define USB_PRODUCT_SIERRA_EM5625 0x0017 /* EM5625 */ #define USB_PRODUCT_SIERRA_MC5720 0x0218 /* MC5720 Wireless Modem */ #define USB_PRODUCT_SIERRA_MC5720_2 0x0018 /* MC5720 */ @@ -2259,6 +2261,10 @@ /* Sphairon Access Systems GmbH products */ #define USB_PRODUCT_SPHAIRON_UB801R 0x0110 /* UB801R */ +/* Stelera Wireless products */ +#define USB_PRODUCT_STELERA_ZEROCD 0x1000 /* Zerocd Installer */ +#define USB_PRODUCT_STELERA_C105 0x1002 /* Stelera/Bandrish C105 USB */ + /* STMicroelectronics products */ #define USB_PRODUCT_STMICRO_BIOCPU 0x2016 /* Biometric Coprocessor */ #define USB_PRODUCT_STMICRO_COMMUNICATOR 0x7554 /* USB Communicator */ Modified: head/sys/dev/usb2/include/usb2_devtable.h ============================================================================== --- head/sys/dev/usb2/include/usb2_devtable.h Fri Dec 12 21:45:10 2008 (r186000) +++ head/sys/dev/usb2/include/usb2_devtable.h Fri Dec 12 21:57:16 2008 (r186001) @@ -4,7 +4,7 @@ * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * FreeBSD: src/sys/dev/usb/usbdevs,v 1.383 2008/11/12 13:58:59 keramida Exp + * FreeBSD: head/sys/dev/usb/usbdevs 185998 2008-12-12 18:34:27Z thompsa */ /* $NetBSD: usbdevs,v 1.392 2004/12/29 08:38:44 imp Exp $ */ @@ -599,9 +599,9 @@ const struct usb_knowndev usb_knowndevs[ "PocketCAM 3Mega", }, { - USB_VENDOR_SUNPLUS, USB_PRODUCT_SUNPLUS_PENCAM_MEGA_1_3, + USB_VENDOR_AIPTEK2, USB_PRODUCT_AIPTEK2_PENCAM_MEGA_1_3, 0, - "Sunplus", + "AIPTEK International", "PenCam Mega 1.3", }, { @@ -1397,7 +1397,7 @@ const struct usb_knowndev usb_knowndevs[ "KB-8933 keyboard", }, { - USB_VENDOR_MICRODIA, USB_PRODUCT_MICRODIA_TWINKLECAM, + USB_VENDOR_CHICONY2, USB_PRODUCT_CHICONY2_TWINKLECAM, 0, "Chicony", "TwinkleCam USB camera", @@ -3125,6 +3125,12 @@ const struct usb_knowndev usb_knowndevs[ "PhotoSmart C500", }, { + USB_VENDOR_HP, USB_PRODUCT_HP_HS2300, + 0, + "Hewlett Packard", + "hs2300 HSDPA (aka MC8775)", + }, + { USB_VENDOR_HTC, USB_PRODUCT_HTC_WINMOBILE, 0, "HTC", @@ -4145,12 +4151,6 @@ const struct usb_knowndev usb_knowndevs[ "RT2573", }, { - USB_VENDOR_MICRODIA, USB_PRODUCT_MICRODIA_TWINKLECAM, - 0, - "Chicony", - "TwinkleCam USB camera", - }, - { USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_SIDEPREC, 0, "Microsoft", @@ -4925,6 +4925,12 @@ const struct usb_knowndev usb_knowndevs[ "GlobeTrotter 3G+ datacard", }, { + USB_VENDOR_OPTION, USB_PRODUCT_OPTION_GTICON322, + 0, + "Option N.V:", + "GlobeTrotter Icon322 storage", + }, + { USB_VENDOR_OPTION, USB_PRODUCT_OPTION_GTMAX36, 0, "Option N.V:", @@ -5921,6 +5927,12 @@ const struct usb_knowndev usb_knowndevs[ "Sierra Wireless Compass 597", }, { + USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC875, + 0, + "Sierra Wireless", + "Sierra Wireless AirCard 875", + }, + { USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC880, 0, "Sierra Wireless", @@ -5957,6 +5969,12 @@ const struct usb_knowndev usb_knowndevs[ "Sierra Wireless AirCard 881U", }, { + USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC885U, + 0, + "Sierra Wireless", + "Sierra Wireless AirCard 885U", + }, + { USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_EM5625, 0, "Sierra Wireless", @@ -6461,6 +6479,18 @@ const struct usb_knowndev usb_knowndevs[ "UB801R", }, { + USB_VENDOR_STELERA, USB_PRODUCT_STELERA_ZEROCD, + 0, + "Stelera Wireless", + "Zerocd Installer", + }, + { + USB_VENDOR_STELERA, USB_PRODUCT_STELERA_C105, + 0, + "Stelera Wireless", + "Stelera/Bandrish C105 USB", + }, + { USB_VENDOR_STMICRO, USB_PRODUCT_STMICRO_BIOCPU, 0, "STMicroelectronics", @@ -8099,9 +8129,9 @@ const struct usb_knowndev usb_knowndevs[ NULL, }, { - USB_VENDOR_SUNPLUS, 0, + USB_VENDOR_AIPTEK2, 0, USB_KNOWNDEV_NOPROD, - "Sunplus", + "AIPTEK International", NULL, }, { @@ -9887,7 +9917,7 @@ const struct usb_knowndev usb_knowndevs[ NULL, }, { - USB_VENDOR_MICRODIA, 0, + USB_VENDOR_CHICONY2, 0, USB_KNOWNDEV_NOPROD, "Chicony", NULL, @@ -10589,6 +10619,12 @@ const struct usb_knowndev usb_knowndevs[ NULL, }, { + USB_VENDOR_STELERA, 0, + USB_KNOWNDEV_NOPROD, + "Stelera Wireless", + NULL, + }, + { USB_VENDOR_DLINK, 0, USB_KNOWNDEV_NOPROD, "D-Link",