Module Name: src
Committed By: martin
Date: Thu Jun 20 17:52:12 UTC 2024
Modified Files:
src/sys/dev/usb [netbsd-10]: if_urtwn.c usbdevs
Log Message:
Pull up following revision(s) (requested by nia in ticket #702):
sys/dev/usb/if_urtwn.c: revision 1.108
sys/dev/usb/usbdevs: revision 1.812
Add Mercusys and Mercusys MW150USV2
>From Daeil Lee in PR/57819
Add Mercusys NW150US V2 USB support
No changes needed, other than recognizing it as working.
>From Daeil Lee in PR/57819
To generate a diff of this commit:
cvs rdiff -u -r1.105.4.1 -r1.105.4.2 src/sys/dev/usb/if_urtwn.c
cvs rdiff -u -r1.806.4.3 -r1.806.4.4 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/if_urtwn.c
diff -u src/sys/dev/usb/if_urtwn.c:1.105.4.1 src/sys/dev/usb/if_urtwn.c:1.105.4.2
--- src/sys/dev/usb/if_urtwn.c:1.105.4.1 Sun Mar 10 18:57:11 2024
+++ src/sys/dev/usb/if_urtwn.c Thu Jun 20 17:52:12 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: if_urtwn.c,v 1.105.4.1 2024/03/10 18:57:11 martin Exp $ */
+/* $NetBSD: if_urtwn.c,v 1.105.4.2 2024/06/20 17:52:12 martin Exp $ */
/* $OpenBSD: if_urtwn.c,v 1.42 2015/02/10 23:25:46 mpi Exp $ */
/*-
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.105.4.1 2024/03/10 18:57:11 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.105.4.2 2024/06/20 17:52:12 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -209,6 +209,7 @@ static const struct urtwn_dev {
/* URTWN_RTL8188E */
URTWN_RTL8188E_DEV(DLINK, DWA125D1),
URTWN_RTL8188E_DEV(ELECOM, WDC150SU2M),
+ URTWN_RTL8188E_DEV(MERCUSYS, MW150USV2),
URTWN_RTL8188E_DEV(REALTEK, RTL8188ETV),
URTWN_RTL8188E_DEV(REALTEK, RTL8188EU),
URTWN_RTL8188E_DEV(ABOCOM, RTL8188EU),
Index: src/sys/dev/usb/usbdevs
diff -u src/sys/dev/usb/usbdevs:1.806.4.3 src/sys/dev/usb/usbdevs:1.806.4.4
--- src/sys/dev/usb/usbdevs:1.806.4.3 Sun Apr 28 13:26:36 2024
+++ src/sys/dev/usb/usbdevs Thu Jun 20 17:52:12 2024
@@ -1,4 +1,4 @@
-$NetBSD: usbdevs,v 1.806.4.3 2024/04/28 13:26:36 martin Exp $
+$NetBSD: usbdevs,v 1.806.4.4 2024/06/20 17:52:12 martin Exp $
/*-
* Copyright (c) 1998-2004 The NetBSD Foundation, Inc.
@@ -585,6 +585,7 @@ vendor HIROSE 0x2631 Hirose Electric
vendor ONEPLUS 0x2717 ONEPLUS
vendor NHJ 0x2770 NHJ
vendor PLANEX 0x2c02 Planex Communications
+vendor MERCUSYS 0x2c4e Mercusys
vendor VIDZMEDIA 0x3275 VidzMedia Pte Ltd
vendor AEI 0x3334 AEI
vendor HANK 0x3353 Hank Connection
@@ -2308,6 +2309,9 @@ product MELCO WLIUCGNM 0x01a2 WLI-UC-GN
product MELCO WLIUCGNM2T 0x01ee WLI-UC-GNM2T
product MELCO WIU2300D 0x0241 WI-U2-300D
+/* Mercusys products */
+product MERCUSYS MW150USV2 0x0102 MW150US V2
+
/* Merlin products */
product MERLIN V620 0x1110 Merlin V620
