[src/netbsd-6]: src/sys/dev/usb Pull up following revision(s) (requested by r...

[bouyer <bouyer%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d9c612db7a5a
branches:  netbsd-6
changeset: 773921:d9c612db7a5a
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Sat Mar 17 17:17:06 2012 +0000

description:
Pull up following revision(s) (requested by riz in ticket #90):
        sys/dev/usb/usbdevs: revision 1.610
        sys/dev/usb/umass_quirks.c: revision 1.93
add product ID for the Kingston DataTraveler 100 G2.
Add quirk for Kingston DataTraveler 100 G2 (which apparently has
a Toshiba vendor ID)

diffstat:

 sys/dev/usb/umass_quirks.c |  13 +++++++++++--
 sys/dev/usb/usbdevs        |   3 ++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diffs (51 lines):

diff -r dabd2f663000 -r d9c612db7a5a sys/dev/usb/umass_quirks.c
--- a/sys/dev/usb/umass_quirks.c        Thu Mar 15 08:53:56 2012 +0000
+++ b/sys/dev/usb/umass_quirks.c        Sat Mar 17 17:17:06 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: umass_quirks.c,v 1.92 2011/12/23 00:51:47 jakllsch Exp $       */
+/*     $NetBSD: umass_quirks.c,v 1.92.2.1 2012/03/17 17:17:07 bouyer Exp $     */
 
 /*
  * Copyright (c) 2001, 2004 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umass_quirks.c,v 1.92 2011/12/23 00:51:47 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umass_quirks.c,v 1.92.2.1 2012/03/17 17:17:07 bouyer Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_umass.h"
@@ -319,6 +319,15 @@
          NULL, NULL
        },
 
+       /* Also, some Kingston pendrives have Toshiba vendor ID */
+       { { USB_VENDOR_TOSHIBA, USB_PRODUCT_KINGSTON_DT100_G2 },
+         UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC, 
+         0,
+         PQUIRK_NODOORLOCK,
+         UMATCH_VENDOR_PRODUCT,
+         NULL, NULL
+       },
+
        /* HP USB pendrives don't like being told to lock the door */
        { { USB_VENDOR_HP, USB_PRODUCT_HP_V125W },
          UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC,
diff -r dabd2f663000 -r d9c612db7a5a sys/dev/usb/usbdevs
--- a/sys/dev/usb/usbdevs       Thu Mar 15 08:53:56 2012 +0000
+++ b/sys/dev/usb/usbdevs       Sat Mar 17 17:17:06 2012 +0000
@@ -1,4 +1,4 @@
-$NetBSD: usbdevs,v 1.607.2.1 2012/02/19 18:43:47 riz Exp $
+$NetBSD: usbdevs,v 1.607.2.2 2012/03/17 17:17:06 bouyer Exp $
 
 /*
  * Copyright (c) 1998-2004 The NetBSD Foundation, Inc.
@@ -1707,6 +1707,7 @@
 product KINGSTON DT101_II      0x1625  DT 101 II
 product KINGSTON DTMINI10      0x162c  DT Mini 10
 product KINGSTON DT101_G2      0x1642  DT 101 G2
+product KINGSTON DT100_G2      0x6544  DT 100 G2
 
 /* Kodak products */
 product KODAK DC220            0x0100  Digital Science DC220