From owner-svn-src-all@FreeBSD.ORG Sat Aug 7 19:02:00 2010 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 4A0491065672; Sat, 7 Aug 2010 19:02:00 +0000 (UTC) (envelope-from gavin@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 19B4A8FC0A; Sat, 7 Aug 2010 19:02:00 +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 o77J207E027885; Sat, 7 Aug 2010 19:02:00 GMT (envelope-from gavin@svn.freebsd.org) Received: (from gavin@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o77J1xPC027883; Sat, 7 Aug 2010 19:01:59 GMT (envelope-from gavin@svn.freebsd.org) Message-Id: <201008071901.o77J1xPC027883@svn.freebsd.org> From: Gavin Atkinson Date: Sat, 7 Aug 2010 19:01:59 +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: r211032 - stable/8/sys/dev/usb 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: Sat, 07 Aug 2010 19:02:00 -0000 Author: gavin Date: Sat Aug 7 19:01:59 2010 New Revision: 211032 URL: http://svn.freebsd.org/changeset/base/211032 Log: Merge r210575 from head: Provide descriptions for three vendors and four devices in usbdevs. Use the official vendor listed for 0x076b, rather than Omnikey, as in the PR. PR: usb/123351 Submitted by: Marcin Cieslak 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 Sat Aug 7 18:30:10 2010 (r211031) +++ stable/8/sys/dev/usb/usbdevs Sat Aug 7 19:01:59 2010 (r211032) @@ -373,6 +373,7 @@ vendor AUREAL 0x0755 Aureal Semiconduct vendor MIDIMAN 0x0763 Midiman vendor CYBERPOWER 0x0764 Cyber Power Systems, Inc. vendor SURECOM 0x0769 Surecom Technology +vendor HIDGLOBAL 0x076b HID Global vendor LINKSYS2 0x077b Linksys vendor GRIFFIN 0x077d Griffin Technology vendor SANDISK 0x0781 SanDisk @@ -437,6 +438,7 @@ vendor BURRBROWN 0x08bb Burr-Brown Japan vendor 2WIRE 0x08c8 2Wire vendor AIPTEK 0x08ca AIPTEK International vendor SMARTBRIDGES 0x08d1 SmartBridges +vendor FUJITSUSIEMENS 0x08d4 Fujitsu-Siemens vendor BILLIONTON 0x08dd Billionton Systems vendor EXTENDED 0x08e9 Extended Systems vendor MSYSTEMS 0x08ec M-Systems @@ -512,6 +514,7 @@ vendor FSC 0x0bf8 Fujitsu Siemens Compu vendor AGATE 0x0c08 Agate Technologies vendor DMI 0x0c0b DMI vendor CHICONY2 0x0c45 Chicony +vendor REINERSCT 0x0c4b Reiner-SCT vendor SEALEVEL 0x0c52 Sealevel System vendor LUWEN 0x0c76 Luwen vendor KYOCERA2 0x0c88 Kyocera Wireless Corp. @@ -1548,6 +1551,9 @@ product FUJIPHOTO MASS0100 0x0100 Mass S /* Fujitsu protducts */ product FUJITSU AH_F401U 0x105b AH-F401U Air H device +/* Fujitsu-Siemens protducts */ +product FUJITSUSIEMENS SCR 0x0009 Fujitsu-Siemens SCR USB Reader + /* Garmin products */ product GARMIN IQUE_3600 0x0004 iQue 3600 @@ -1642,6 +1648,10 @@ product HAWKING HWUN2 0x0009 HWUN2 product HAWKING RT3070 0x000b RT3070 product HAWKING UF100 0x400c 10/100 USB Ethernet +/* HID Global GmbH products */ +product HIDGLOBAL CM2020 0x0596 Omnikey Cardman 2020 +product HIDGLOBAL CM6020 0x1784 Omnikey Cardman 6020 + /* Hitachi, Ltd. products */ product HITACHI DVDCAM_DZ_MV100A 0x0004 DVD-CAM DZ-MV100A Camcorder product HITACHI DVDCAM_USB 0x001e DVDCAM USB HS Interface @@ -2598,6 +2608,9 @@ product RICOH VGPVCC2_3 0x1834 VGP-VCC2 product RICOH VGPVCC7 0x183a VGP-VCC7 Camera product RICOH VGPVCC8 0x183b VGP-VCC8 Camera +/* Reiner-SCT products */ +product REINERSCT CYBERJACK_ECOM 0x0100 e-com cyberJack + /* Roland products */ product ROLAND UM1 0x0009 UM-1 MIDI I/F product ROLAND UM880N 0x0014 EDIROL UM-880 MIDI I/F (native)