Module Name: src
Committed By: martin
Date: Thu Feb 27 14:32:31 UTC 2020
Modified Files:
src/sys/dev/usb [netbsd-8]: u3g.c umodeswitch.c usbdevs
Log Message:
Pull up following revision(s) (requested by manu in ticket #1508):
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.34 -r1.34.2.1 src/sys/dev/usb/u3g.c
cvs rdiff -u -r1.1 -r1.1.2.1 src/sys/dev/usb/umodeswitch.c
cvs rdiff -u -r1.736.2.5 -r1.736.2.6 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.34 src/sys/dev/usb/u3g.c:1.34.2.1
--- src/sys/dev/usb/u3g.c:1.34 Wed May 24 20:23:58 2017
+++ src/sys/dev/usb/u3g.c Thu Feb 27 14:32:31 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: u3g.c,v 1.34 2017/05/24 20:23:58 christos Exp $ */
+/* $NetBSD: u3g.c,v 1.34.2.1 2020/02/27 14:32:31 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.34 2017/05/24 20:23:58 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: u3g.c,v 1.34.2.1 2020/02/27 14:32:31 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -258,6 +258,10 @@ static const struct usb_devno u3g_devs[]
/* 4G Systems */
{ USB_VENDOR_4GSYSTEMS, USB_PRODUCT_4GSYSTEMS_XSSTICK_P14 },
{ USB_VENDOR_4GSYSTEMS, USB_PRODUCT_4GSYSTEMS_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.1 src/sys/dev/usb/umodeswitch.c:1.1.2.1
--- src/sys/dev/usb/umodeswitch.c:1.1 Wed May 24 20:23:58 2017
+++ src/sys/dev/usb/umodeswitch.c Thu Feb 27 14:32:31 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: umodeswitch.c,v 1.1 2017/05/24 20:23:58 christos Exp $ */
+/* $NetBSD: umodeswitch.c,v 1.1.2.1 2020/02/27 14:32:31 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.1 2017/05/24 20:23:58 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umodeswitch.c,v 1.1.2.1 2020/02/27 14:32:31 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -428,6 +428,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.736.2.5 src/sys/dev/usb/usbdevs:1.736.2.6
--- src/sys/dev/usb/usbdevs:1.736.2.5 Thu Aug 1 13:40:54 2019
+++ src/sys/dev/usb/usbdevs Thu Feb 27 14:32:31 2020
@@ -1,4 +1,4 @@
-$NetBSD: usbdevs,v 1.736.2.5 2019/08/01 13:40:54 martin Exp $
+$NetBSD: usbdevs,v 1.736.2.6 2020/02/27 14:32:31 martin Exp $
/*-
* Copyright (c) 1998-2004 The NetBSD Foundation, Inc.
@@ -1425,8 +1425,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
