Module Name: src
Committed By: martin
Date: Thu Feb 27 17:22:56 UTC 2020
Modified Files:
src/sys/dev/usb [netbsd-9]: u3g.c umodeswitch.c usbdevs
Log Message:
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
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.37.2.1 src/sys/dev/usb/u3g.c
cvs rdiff -u -r1.4 -r1.4.6.1 src/sys/dev/usb/umodeswitch.c
cvs rdiff -u -r1.770.4.2 -r1.770.4.3 src/sys/dev/usb/usbdevs
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/u3g.c
diff -u src/sys/dev/usb/u3g.c:1.37 src/sys/dev/usb/u3g.c:1.37.2.1
--- src/sys/dev/usb/u3g.c:1.37 Thu May 9 02:43:35 2019
+++ src/sys/dev/usb/u3g.c Thu Feb 27 17:22:56 2020
@@ -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 @@ static const struct usb_devno u3g_devs[]
/* 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 },
};
/*
Index: src/sys/dev/usb/umodeswitch.c
diff -u src/sys/dev/usb/umodeswitch.c:1.4 src/sys/dev/usb/umodeswitch.c:1.4.6.1
--- src/sys/dev/usb/umodeswitch.c:1.4 Tue Jul 24 08:15:57 2018
+++ src/sys/dev/usb/umodeswitch.c Thu Feb 27 17:22:56 2020
@@ -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 @@ umodeswitch_match(device_t parent, cfdat
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;
}
Index: src/sys/dev/usb/usbdevs
diff -u src/sys/dev/usb/usbdevs:1.770.4.2 src/sys/dev/usb/usbdevs:1.770.4.3
--- src/sys/dev/usb/usbdevs:1.770.4.2 Tue Jan 21 10:39:59 2020
+++ src/sys/dev/usb/usbdevs Thu Feb 27 17:22:56 2020
@@ -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 DSB650TX_PNA 0x4003 1/10/1
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
