sync code with last fixes and improvements from OpenBSD

This commit is contained in:
purplerain 2023-06-12 17:03:20 +00:00
parent 8f31919cdb
commit 25f3a6cfac
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
76 changed files with 1289 additions and 694 deletions

View file

@ -1,4 +1,4 @@
/* $OpenBSD: if_urtwn.c,v 1.107 2023/04/28 01:24:14 kevlo Exp $ */
/* $OpenBSD: if_urtwn.c,v 1.108 2023/06/12 11:27:30 jsg Exp $ */
/*-
* Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr>
@ -333,6 +333,7 @@ static const struct urtwn_type {
URTWN_DEV_8188EU(DLINK, DWA125D1),
URTWN_DEV_8188EU(EDIMAX, EW7811UNV2),
URTWN_DEV_8188EU(ELECOM, WDC150SU2M),
URTWN_DEV_8188EU(MERCUSYS, MW150USV2),
URTWN_DEV_8188EU(REALTEK, RTL8188ETV),
URTWN_DEV_8188EU(REALTEK, RTL8188EU),
URTWN_DEV_8188EU(TPLINK, RTL8188EUS),

View file

@ -1,4 +1,4 @@
$OpenBSD: usbdevs,v 1.756 2023/05/10 18:26:05 miod Exp $
$OpenBSD: usbdevs,v 1.757 2023/06/12 11:26:24 jsg Exp $
/* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
/*
@ -645,6 +645,7 @@ vendor THINGM 0x27b8 ThingM
vendor ASUSTEK 0x2821 ASUSTeK Computer
vendor PIONEERDJ 0x2b73 Pioneer DJ
vendor PLANEX 0x2c02 Planex Communications
vendor MERCUSYS 0x2c4e Mercusys
vendor QUECTEL 0x2c7c Quectel
vendor CLUB3D 0x2d1c Club 3D
vendor AQUANTIA 0x2eca Aquantia
@ -3099,6 +3100,9 @@ product MELCO UWABR100 0x017f SONY UWA-BR100
product MELCO WLIUCGNM 0x01a2 WLI-UC-GNM
product MELCO WLIUCGNM2 0x01ee WLI-UC-GNM2
/* Mercusys products */
product MERCUSYS MW150USV2 0x0102 MW150US V2
/* MetaGeek products */
product METAGEEK WISPY24I 0x2400 Wi-Spy 2.4i

View file

@ -1,10 +1,10 @@
/* $OpenBSD: usbdevs.h,v 1.768 2023/05/10 18:26:43 miod Exp $ */
/* $OpenBSD: usbdevs.h,v 1.769 2023/06/12 11:26:54 jsg Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
* OpenBSD: usbdevs,v 1.756 2023/05/10 18:26:05 miod Exp
* OpenBSD: usbdevs,v 1.757 2023/06/12 11:26:24 jsg Exp
*/
/* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
@ -652,6 +652,7 @@
#define USB_VENDOR_ASUSTEK 0x2821 /* ASUSTeK Computer */
#define USB_VENDOR_PIONEERDJ 0x2b73 /* Pioneer DJ */
#define USB_VENDOR_PLANEX 0x2c02 /* Planex Communications */
#define USB_VENDOR_MERCUSYS 0x2c4e /* Mercusys */
#define USB_VENDOR_QUECTEL 0x2c7c /* Quectel */
#define USB_VENDOR_CLUB3D 0x2d1c /* Club 3D */
#define USB_VENDOR_AQUANTIA 0x2eca /* Aquantia */
@ -3106,6 +3107,9 @@
#define USB_PRODUCT_MELCO_WLIUCGNM 0x01a2 /* WLI-UC-GNM */
#define USB_PRODUCT_MELCO_WLIUCGNM2 0x01ee /* WLI-UC-GNM2 */
/* Mercusys products */
#define USB_PRODUCT_MERCUSYS_MW150USV2 0x0102 /* MW150US V2 */
/* MetaGeek products */
#define USB_PRODUCT_METAGEEK_WISPY24I 0x2400 /* Wi-Spy 2.4i */

View file

@ -1,10 +1,10 @@
/* $OpenBSD: usbdevs_data.h,v 1.762 2023/05/10 18:26:43 miod Exp $ */
/* $OpenBSD: usbdevs_data.h,v 1.763 2023/06/12 11:26:54 jsg Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
* OpenBSD: usbdevs,v 1.756 2023/05/10 18:26:05 miod Exp
* OpenBSD: usbdevs,v 1.757 2023/06/12 11:26:24 jsg Exp
*/
/* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
@ -7513,6 +7513,10 @@ const struct usb_known_product usb_known_products[] = {
USB_VENDOR_MELCO, USB_PRODUCT_MELCO_WLIUCGNM2,
"WLI-UC-GNM2",
},
{
USB_VENDOR_MERCUSYS, USB_PRODUCT_MERCUSYS_MW150USV2,
"MW150US V2",
},
{
USB_VENDOR_METAGEEK, USB_PRODUCT_METAGEEK_WISPY24I,
"Wi-Spy 2.4i",
@ -14681,6 +14685,10 @@ const struct usb_known_vendor usb_known_vendors[] = {
USB_VENDOR_PLANEX,
"Planex Communications",
},
{
USB_VENDOR_MERCUSYS,
"Mercusys",
},
{
USB_VENDOR_QUECTEL,
"Quectel",