From owner-p4-projects@FreeBSD.ORG Wed Jul 28 08:21:41 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2A80F1065F16; Wed, 28 Jul 2010 08:21:38 +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 E0CD81065741 for ; Wed, 28 Jul 2010 08:21:37 +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 A1F5B8FC23 for ; Wed, 28 Jul 2010 08:21:36 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o6S8LaIn009167 for ; Wed, 28 Jul 2010 08:21:36 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o6S8La5s009165 for perforce@freebsd.org; Wed, 28 Jul 2010 08:21:36 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 28 Jul 2010 08:21:36 GMT Message-Id: <201007280821.o6S8La5s009165@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 Precedence: bulk Cc: Subject: PERFORCE change 181471 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Jul 2010 08:21:41 -0000 http://p4web.freebsd.org/@@181471?ac=10 Change 181471 by hselasky@hselasky_laptop001 on 2010/07/26 23:07:10 USB devices: - correct some device names - patch by: Dmitry Luhtionov Reviewed by: hselasky @ Affected files ... .. //depot/projects/usb/src/sys/dev/usb/quirk/usb_quirk.c#34 edit .. //depot/projects/usb/src/sys/dev/usb/usbdevs#130 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/quirk/usb_quirk.c#34 (text+ko) ==== @@ -449,8 +449,9 @@ USB_QUIRK(ACTIONS, MP4, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_NO_SYNC_CACHE), USB_QUIRK(ASUS, GMSC, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE), - USB_QUIRK(UNKNOWN4, USBMEMSTICK, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE), - USB_QUIRK(UNKNOWN5, USB2IDEBRIDGE, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE), + USB_QUIRK(CHIPSBANK, USBMEMSTICK, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE), + USB_QUIRK(CHIPSBANK, USBMEMSTICK1, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE), + USB_QUIRK(NEWLINK, USB2IDEBRIDGE, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE), }; #undef USB_QUIRK_VP #undef USB_QUIRK ==== //depot/projects/usb/src/sys/dev/usb/usbdevs#130 (text+ko) ==== @@ -58,7 +58,7 @@ vendor UNKNOWN1 0x0053 Unknown vendor vendor UNKNOWN2 0x0105 Unknown vendor vendor EGALAX2 0x0123 eGalax, Inc. -vendor UNKNOWN4 0x0204 Unknown vendor +vendor CHIPSBANK 0x0204 Chipsbank Microelectronics Co. vendor HUMAX 0x02ad HUMAX vendor LTS 0x0386 LTS vendor BWCT 0x03da Bernd Walter Computer Technology @@ -400,7 +400,7 @@ vendor ALLIEDCABLE 0x07e6 Allied Cable vendor STSN 0x07ef STSN vendor CENTURY 0x07f7 Century Corp -vendor UNKNOWN5 0x07ff Unknown +vendor NEWLINK 0x07ff NEWlink vendor ZOOM 0x0803 Zoom Telephonics vendor PCS 0x0810 Personal Communication Systems vendor ALPHASMART 0x081e AlphaSmart, Inc. @@ -1241,6 +1241,10 @@ product CSR BT_DONGLE 0x0001 Bluetooth USB dongle product CSR CSRDFU 0xffff USB Bluetooth Device in DFU State +/* Chipsbank Microelectronics Co., Ltd */ +product CHIPSBANK USBMEMSTICK 0x6025 CBM2080 Flash drive controller +product CHIPSBANK USBMEMSTICK1 0x6026 CBM1180 Flash drive controller + /* CTX products */ product CTX EX1300 0x9999 Ex1300 hub @@ -2198,6 +2202,9 @@ product NETGEAR3 WPN111_NF 0x5f01 WPN111 (no firmware) product NETGEAR3 WPN111_2 0x5f02 WPN111 +/* NEWlink */ +product NEWLINK USB2IDEBRIDGE 0x00ff USB 2.0 Hard Drive Enclosure + /* Nikon products */ product NIKON E990 0x0102 Digital Camera E990 product NIKON LS40 0x4000 CoolScan LS40 ED @@ -3049,12 +3056,6 @@ /* Universal Access products */ product UNIACCESS PANACHE 0x0101 Panache Surf USB ISDN Adapter -/* Unknown vendors */ -product UNKNOWN4 USBMEMSTICK 0x6025 Flash Disk CBM - -/* Unknown vendors */ -product UNKNOWN5 USB2IDEBRIDGE 0x00ff USB 2.0 ATA/SATA Bridge - /* U.S. Robotics products */ product USR USR5422 0x0118 USR5422 WLAN product USR USR5423 0x0121 USR5423 WLAN