Module Name: src
Committed By: msaitoh
Date: Tue Jul 24 08:15:57 UTC 2018
Modified Files:
src/sys/dev/usb: u3g.c ugensa.c umodeswitch.c usb_quirks.c
Log Message:
- USB_VENDOR_QUALCOMM -> USB_VENDOR_LG
- USB_VENDOR_4GSYSTEMS -> USB_VENDOR_LONGCHEER
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/dev/usb/u3g.c
cvs rdiff -u -r1.35 -r1.36 src/sys/dev/usb/ugensa.c
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/usb/umodeswitch.c
cvs rdiff -u -r1.86 -r1.87 src/sys/dev/usb/usb_quirks.c
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.35
--- src/sys/dev/usb/u3g.c:1.34 Wed May 24 20:23:58 2017
+++ src/sys/dev/usb/u3g.c Tue Jul 24 08:15:57 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: u3g.c,v 1.34 2017/05/24 20:23:58 christos Exp $ */
+/* $NetBSD: u3g.c,v 1.35 2018/07/24 08:15:57 msaitoh 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.35 2018/07/24 08:15:57 msaitoh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -189,6 +189,8 @@ static const struct usb_devno u3g_devs[]
{ USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_MOBILE },
{ USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_E171 },
{ USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_E353 },
+ /* LG Electronics */
+ { USB_VENDOR_LG, USB_PRODUCT_LG_NTT_DOCOMO_L02C_MODEM },
/* OEM: Merlin */
{ USB_VENDOR_MERLIN, USB_PRODUCT_MERLIN_V620 },
/* OEM: Novatel */
@@ -215,8 +217,6 @@ static const struct usb_devno u3g_devs[]
{ USB_VENDOR_OPTIONNV, USB_PRODUCT_OPTIONNV_QUADPLUSUMTS },
{ USB_VENDOR_OPTIONNV, USB_PRODUCT_OPTIONNV_HSDPA },
{ USB_VENDOR_OPTIONNV, USB_PRODUCT_OPTIONNV_GTMAXHSUPA },
- /* OEM: Qualcomm, Inc. */
- { USB_VENDOR_QUALCOMM, USB_PRODUCT_QUALCOMM_NTT_DOCOMO_L02C_MODEM },
/* OEM: Sierra Wireless: */
{ USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC595U },
@@ -256,8 +256,8 @@ static const struct usb_devno u3g_devs[]
{ USB_VENDOR_ZTE, USB_PRODUCT_ZTE_MF820D },
/* 4G Systems */
- { USB_VENDOR_4GSYSTEMS, USB_PRODUCT_4GSYSTEMS_XSSTICK_P14 },
- { USB_VENDOR_4GSYSTEMS, USB_PRODUCT_4GSYSTEMS_XSSTICK_W14 },
+ { USB_VENDOR_LONGCHEER, USB_PRODUCT_LONGCHEER_XSSTICK_P14 },
+ { USB_VENDOR_LONGCHEER, USB_PRODUCT_LONGCHEER_XSSTICK_W14 },
};
/*
Index: src/sys/dev/usb/ugensa.c
diff -u src/sys/dev/usb/ugensa.c:1.35 src/sys/dev/usb/ugensa.c:1.36
--- src/sys/dev/usb/ugensa.c:1.35 Fri Nov 25 12:56:29 2016
+++ src/sys/dev/usb/ugensa.c Tue Jul 24 08:15:57 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ugensa.c,v 1.35 2016/11/25 12:56:29 skrll Exp $ */
+/* $NetBSD: ugensa.c,v 1.36 2018/07/24 08:15:57 msaitoh Exp $ */
/*
* Copyright (c) 2004, 2005 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ugensa.c,v 1.35 2016/11/25 12:56:29 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ugensa.c,v 1.36 2018/07/24 08:15:57 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -107,7 +107,7 @@ static const struct ugensa_type ugensa_d
{{ USB_VENDOR_ANYDATA, USB_PRODUCT_ANYDATA_ADU_500A }, UNTESTED },
{{ USB_VENDOR_NOVATEL2, USB_PRODUCT_NOVATEL2_EXPRESSCARD }, UNTESTED },
- {{ USB_VENDOR_QUALCOMM, USB_PRODUCT_QUALCOMM_MSM_HSDPA }, UNTESTED },
+ {{ USB_VENDOR_LG, USB_PRODUCT_LG_MSM_HSDPA }, UNTESTED },
{{ USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AIRCARD875 }, UNTESTED },
{{ USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_EM5625 }, UNTESTED },
};
Index: src/sys/dev/usb/umodeswitch.c
diff -u src/sys/dev/usb/umodeswitch.c:1.3 src/sys/dev/usb/umodeswitch.c:1.4
--- src/sys/dev/usb/umodeswitch.c:1.3 Sat Aug 5 12:38:08 2017
+++ src/sys/dev/usb/umodeswitch.c Tue Jul 24 08:15:57 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: umodeswitch.c,v 1.3 2017/08/05 12:38:08 khorben Exp $ */
+/* $NetBSD: umodeswitch.c,v 1.4 2018/07/24 08:15:57 msaitoh 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.3 2017/08/05 12:38:08 khorben Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umodeswitch.c,v 1.4 2018/07/24 08:15:57 msaitoh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -401,8 +401,8 @@ umodeswitch_match(device_t parent, cfdat
}
break;
- case USB_VENDOR_QUALCOMM:
- if (uaa->uaa_product == USB_PRODUCT_QUALCOMM_NTT_DOCOMO_L02C_STORAGE)
+ case USB_VENDOR_LG:
+ if (uaa->uaa_product == USB_PRODUCT_LG_NTT_DOCOMO_L02C_STORAGE)
return u3g_bulk_scsi_eject(uaa->uaa_device);
break;
@@ -431,8 +431,8 @@ umodeswitch_match(device_t parent, cfdat
}
break;
- case USB_VENDOR_4GSYSTEMS:
- if (uaa->uaa_product == USB_PRODUCT_4GSYSTEMS_XSSTICK_P14_INSTALLER)
+ case USB_VENDOR_LONGCHEER:
+ if (uaa->uaa_product == USB_PRODUCT_LONGCHEER_XSSTICK_P14_INSTALLER)
return u3g_4gsystems_reinit(uaa->uaa_device);
break;
Index: src/sys/dev/usb/usb_quirks.c
diff -u src/sys/dev/usb/usb_quirks.c:1.86 src/sys/dev/usb/usb_quirks.c:1.87
--- src/sys/dev/usb/usb_quirks.c:1.86 Sun Dec 4 10:12:35 2016
+++ src/sys/dev/usb/usb_quirks.c Tue Jul 24 08:15:57 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: usb_quirks.c,v 1.86 2016/12/04 10:12:35 skrll Exp $ */
+/* $NetBSD: usb_quirks.c,v 1.87 2018/07/24 08:15:57 msaitoh Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb_quirks.c,v 1.30 2003/01/02 04:15:55 imp Exp $ */
/*
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usb_quirks.c,v 1.86 2016/12/04 10:12:35 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb_quirks.c,v 1.87 2018/07/24 08:15:57 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -142,7 +142,7 @@ Static const struct usbd_quirk_entry {
{ USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPHONE_3GS,
ANY, { UQ_HID_IGNORE | UQ_BAD_AUDIO }},
- { USB_VENDOR_QUALCOMM, USB_PRODUCT_QUALCOMM_CDMA_MSM,
+ { USB_VENDOR_LG, USB_PRODUCT_LG_CDMA_MSM,
ANY, { UQ_ASSUME_CM_OVER_DATA }},
{ USB_VENDOR_QUALCOMM2, USB_PRODUCT_QUALCOMM2_CDMA_MSM,
ANY, { UQ_ASSUME_CM_OVER_DATA }},
