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

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

details:   https://anonhg.NetBSD.org/src/rev/be88712d1e5d
branches:  netbsd-9
changeset: 843898:be88712d1e5d
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Feb 27 17:22:56 2020 +0000

description:
Pull up following revision(s) (requested by manu in ticket #719):

        sys/dev/usb/usbdevs: revision 1.776
        sys/dev/usb/u3g.c: revision 1.40
        sys/dev/usb/umodeswitch.c: revision 1.5

Add UE version of D-Link DWM-157
 -
Add support for D-Link DWM-157 3G USB modem

diffstat:

 sys/dev/usb/u3g.c         |   8 ++++++--
 sys/dev/usb/umodeswitch.c |  15 +++++++++++++--
 sys/dev/usb/usbdevs       |   4 +++-
 3 files changed, 22 insertions(+), 5 deletions(-)

diffs (85 lines):

diff -r 97866544a4bc -r be88712d1e5d sys/dev/usb/u3g.c
--- a/sys/dev/usb/u3g.c Tue Feb 25 20:29:30 2020 +0000
+++ b/sys/dev/usb/u3g.c Thu Feb 27 17:22:56 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: u3g.c,v 1.37 2019/05/09 02:43:35 mrg Exp $     */
+/*     $NetBSD: u3g.c,v 1.37.2.1 2020/02/27 17:22:56 martin Exp $      */
 
 /*-
  * Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -50,7 +50,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: u3g.c,v 1.37 2019/05/09 02:43:35 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: u3g.c,v 1.37.2.1 2020/02/27 17:22:56 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -255,6 +255,10 @@
        /* 4G Systems */
        { USB_VENDOR_LONGCHEER, USB_PRODUCT_LONGCHEER_XSSTICK_P14 },
        { USB_VENDOR_LONGCHEER, USB_PRODUCT_LONGCHEER_XSSTICK_W14 },
+
+       /* DLink */
+       { USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DWM157 },
+       { USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DWM157E },
 };
 
 /*
diff -r 97866544a4bc -r be88712d1e5d sys/dev/usb/umodeswitch.c
--- a/sys/dev/usb/umodeswitch.c Tue Feb 25 20:29:30 2020 +0000
+++ b/sys/dev/usb/umodeswitch.c Thu Feb 27 17:22:56 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: umodeswitch.c,v 1.4 2018/07/24 08:15:57 msaitoh Exp $  */
+/*     $NetBSD: umodeswitch.c,v 1.4.6.1 2020/02/27 17:22:56 martin Exp $       */
 
 /*-
  * Copyright (c) 2009, 2017 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
 
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umodeswitch.c,v 1.4 2018/07/24 08:15:57 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umodeswitch.c,v 1.4.6.1 2020/02/27 17:22:56 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -436,6 +436,17 @@
                        return u3g_4gsystems_reinit(uaa->uaa_device);
                break;
 
+       case USB_VENDOR_DLINK:
+               switch (uaa->uaa_product) {
+               case USB_PRODUCT_DLINK_DWM157E_CD:
+               case USB_PRODUCT_DLINK_DWM157_CD:
+                       (void)u3g_bulk_ata_eject(uaa->uaa_device);
+                       (void)u3g_bulk_scsi_eject(uaa->uaa_device);
+                       return UMATCH_HIGHEST;
+               default:
+                       break;
+               }
+
        default:
                break;
        }
diff -r 97866544a4bc -r be88712d1e5d sys/dev/usb/usbdevs
--- a/sys/dev/usb/usbdevs       Tue Feb 25 20:29:30 2020 +0000
+++ b/sys/dev/usb/usbdevs       Thu Feb 27 17:22:56 2020 +0000
@@ -1,4 +1,4 @@
-$NetBSD: usbdevs,v 1.770.4.2 2020/01/21 10:39:59 martin Exp $
+$NetBSD: usbdevs,v 1.770.4.3 2020/02/27 17:22:56 martin Exp $
 
 /*-
  * Copyright (c) 1998-2004 The NetBSD Foundation, Inc.
@@ -1423,8 +1423,10 @@
 product DLINK DSB650TX3                0x400b  10/100 ethernet adapter
 product DLINK DSB650TX2                0x4102  10/100 ethernet adapter
 product DLINK DSB650           0xabc1  10/100 ethernet adapter
+product DLINK DWM157E_CD       0xa407  DWM-157 CD-ROM Mode
 product DLINK DWM157_CD                0xa707  DWM-157 CD-ROM Mode
 product DLINK DWM157           0x7d02  DWM-157 LTE
+product DLINK DWM157E          0x7d0e  DWM-157 LTE
 product DLINK DWM222_CD                0xab00  DWM-222 CD-ROM Mode
 product DLINK DWM222           0x7e35  DWM-222 LTE
 product DLINK DWR510_CD                0xa805  DWR-510 CD-ROM Mode