From owner-svn-src-stable@FreeBSD.ORG Fri Nov 19 01:39:29 2010 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B1E04106564A; Fri, 19 Nov 2010 01:39:29 +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 A13F98FC1F; Fri, 19 Nov 2010 01:39:29 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oAJ1dTov052280; Fri, 19 Nov 2010 01:39:29 GMT (envelope-from thompsa@svn.freebsd.org) Received: (from thompsa@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oAJ1dTIW052278; Fri, 19 Nov 2010 01:39:29 GMT (envelope-from thompsa@svn.freebsd.org) Message-Id: <201011190139.oAJ1dTIW052278@svn.freebsd.org> From: Andrew Thompson Date: Fri, 19 Nov 2010 01:39:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r215490 - stable/8/sys/dev/usb X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Nov 2010 01:39:29 -0000 Author: thompsa Date: Fri Nov 19 01:39:29 2010 New Revision: 215490 URL: http://svn.freebsd.org/changeset/base/215490 Log: MFC r211021 Sort this file a little better: the vendors are supposed to be sorted by vendor ID in the vendor section, and by symbolic name in the product section. Products are sorted by product ID. While here, get rid of a duplicate Microsoft Mouse entry, revealed by sorting. Modified: stable/8/sys/dev/usb/usbdevs Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) stable/8/sys/dev/xen/xenpci/ (props changed) Modified: stable/8/sys/dev/usb/usbdevs ============================================================================== --- stable/8/sys/dev/usb/usbdevs Fri Nov 19 01:36:40 2010 (r215489) +++ stable/8/sys/dev/usb/usbdevs Fri Nov 19 01:39:29 2010 (r215490) @@ -560,6 +560,7 @@ vendor DYNASTREAM 0x0fcf Dynastream Inno vendor QUALCOMM 0x1004 Qualcomm vendor APACER 0x1005 Apacer vendor MOTOROLA4 0x100d Motorola +vendor AIRPLUS 0x1011 Airplus vendor DESKNOTE 0x1019 Desknote vendor GIGABYTE 0x1044 GIGABYTE vendor WESTERN 0x1058 Western Digital @@ -574,7 +575,6 @@ vendor SILABS 0x10c4 Silicon Labs vendor SILABS3 0x10c5 Silicon Labs vendor SILABS4 0x10ce Silicon Labs vendor ACTIONS 0x10d6 Actions -vendor AIRPLUS 0x1011 Airplus vendor ANALOG 0x1110 Analog Devices vendor TENX 0x1130 Ten X Technology, Inc. vendor ISSC 0x1131 Integrated System Solution Corp. @@ -2161,11 +2161,10 @@ product MICROSOFT MN110 0x007a 10/100 U product MICROSOFT WLINTELLIMOUSE 0x008c Wireless Optical IntelliMouse product MICROSOFT WLNOTEBOOK 0x00b9 Wireless Optical Mouse (Model 1023) product MICROSOFT COMFORT3000 0x00d1 Comfort Optical Mouse 3000 (Model 1043) -product MICROSOFT WLNOTEBOOK2 0x00e1 Wireless Optical Mouse 3000 (Model 1056) product MICROSOFT WLNOTEBOOK3 0x00d2 Wireless Optical Mouse 3000 (Model 1049) -product MICROSOFT WLUSBMOUSE 0x00b9 Wireless USB Mouse -product MICROSOFT XBOX360 0x0292 XBOX 360 WLAN product MICROSOFT NATURAL4000 0x00db Natural Ergonomic Keyboard 4000 +product MICROSOFT WLNOTEBOOK2 0x00e1 Wireless Optical Mouse 3000 (Model 1056) +product MICROSOFT XBOX360 0x0292 XBOX 360 WLAN /* Microtech products */ product MICROTECH SCSIDB25 0x0004 USB-SCSI-DB25 @@ -3229,6 +3228,9 @@ product UNKNOWN4 USBMEMSTICK 0x6025 Flas /* Unknown vendors */ product UNKNOWN5 USB2IDEBRIDGE 0x00ff USB 2.0 ATA/SATA Bridge +/* USI products */ +product USI MC60 0x10c5 MC60 Serial + /* U.S. Robotics products */ product USR USR5422 0x0118 USR5422 WLAN product USR USR5423 0x0121 USR5423 WLAN @@ -3236,9 +3238,6 @@ product USR USR5423 0x0121 USR5423 WLAN /* VIA Technologies products */ product VIA USB2IDEBRIDGE 0x6204 USB 2.0 IDE Bridge -/* USI products */ -product USI MC60 0x10c5 MC60 Serial - /* Vaisala products */ product VAISALA CABLE 0x0200 USB Interface cable @@ -3309,9 +3308,6 @@ product XIRLINK PCCAM 0x8080 IBM PC Cam product XYRATEX PRISM_GT_1 0x2000 PrismGT USB 2.0 WLAN product XYRATEX PRISM_GT_2 0x2002 PrismGT USB 2.0 WLAN -/* Y-E Data products */ -product YEDATA FLASHBUSTERU 0x0000 Flashbuster-U - /* Yamaha products */ product YAMAHA UX256 0x1000 UX256 MIDI I/F product YAMAHA UX96 0x1008 UX96 MIDI I/F