From 6bda95ad3f1f52f61ddec97f4fa6df8dfebb48b1 Mon Sep 17 00:00:00 2001 From: morrownr Date: Thu, 11 Jul 2024 20:50:59 -0500 Subject: [PATCH] add support for Mercusys MA30H --- os_dep/linux/usb_intf.c | 49 +++++++++++++++---------------- supported-device-IDs | 64 ++++++++++++++++++++--------------------- 2 files changed, 57 insertions(+), 56 deletions(-) diff --git a/os_dep/linux/usb_intf.c b/os_dep/linux/usb_intf.c index f3946f3..d365609 100644 --- a/os_dep/linux/usb_intf.c +++ b/os_dep/linux/usb_intf.c @@ -239,38 +239,39 @@ static struct usb_device_id rtw_usb_id_tbl[] = { #ifdef CONFIG_RTL8822B /*=== Realtek demoboard ===*/ - {USB_DEVICE_AND_INTERFACE_INFO(USB_VENDER_ID_REALTEK, 0xB82C, 0xff, 0xff, 0xff), .driver_info = RTL8822B}, /* Default ID for USB multi-function */ {USB_DEVICE_AND_INTERFACE_INFO(USB_VENDER_ID_REALTEK, 0xB812, 0xff, 0xff, 0xff), .driver_info = RTL8822B}, /* Default ID for USB Single-function, WiFi only */ {USB_DEVICE_AND_INTERFACE_INFO(USB_VENDER_ID_REALTEK, 0xB81A, 0xff, 0xff, 0xff), .driver_info = RTL8822B}, /* Default ID */ + {USB_DEVICE_AND_INTERFACE_INFO(USB_VENDER_ID_REALTEK, 0xB82C, 0xff, 0xff, 0xff), .driver_info = RTL8822B}, /* Default ID for USB multi-function */ /*=== Customer ID ===*/ + {USB_DEVICE_AND_INTERFACE_INFO(0x04CA, 0x8602, 0xff, 0xff, 0xff), .driver_info = RTL8822B}, /* LiteOn */ + {USB_DEVICE_AND_INTERFACE_INFO(0x056E, 0x4011, 0xff, 0xff, 0xff), .driver_info = RTL8822B}, /* Elecom */ + {USB_DEVICE_AND_INTERFACE_INFO(0x0846, 0x9055, 0xff, 0xff, 0xff), .driver_info = RTL8822B}, /* Netgear A6150 */ + {USB_DEVICE_AND_INTERFACE_INFO(0x0B05, 0x1841, 0xff, 0xff, 0xff), .driver_info = RTL8822B}, /* ASUS AC1300 USB-AC55 B1 */ + {USB_DEVICE_AND_INTERFACE_INFO(0x0B05, 0x184C, 0xff, 0xff, 0xff), .driver_info = RTL8822B}, /* ASUS U2 */ + {USB_DEVICE_AND_INTERFACE_INFO(0x0B05, 0x1870, 0xff, 0xff, 0xff), .driver_info = RTL8822B}, /* ASUS */ + {USB_DEVICE_AND_INTERFACE_INFO(0x0B05, 0x1874, 0xff, 0xff, 0xff), .driver_info = RTL8822B}, /* ASUS */ + {USB_DEVICE_AND_INTERFACE_INFO(0x0B05, 0x19AA, 0xff, 0xff, 0xff), .driver_info = RTL8822B}, /* ASUS - USB-AC58 rev A1 */ + {USB_DEVICE_AND_INTERFACE_INFO(0x0BDA, 0x2102, 0xff, 0xff, 0xff), .driver_info = RTL8822B}, /* CCNC */ + {USB_DEVICE_AND_INTERFACE_INFO(0x0E66, 0x0025, 0xff, 0xff, 0xff), .driver_info = RTL8822B}, /* Hawking HW12ACU */ + {USB_DEVICE_AND_INTERFACE_INFO(0x13B1, 0x0043, 0xff, 0xff, 0xff), .driver_info = RTL8822B}, /* Alpha - Linksys */ + {USB_DEVICE_AND_INTERFACE_INFO(0x13B1, 0x0045, 0xff, 0xff, 0xff), .driver_info = RTL8822B}, /* Linksys WUSB3600 v2 */ + {USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x331C, 0xff, 0xff, 0xff), .driver_info = RTL8822B}, /* Dlink - DWA-182 - D1 */ + {USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x331E, 0xff, 0xff, 0xff), .driver_info = RTL8822B}, /* Dlink - DWA-181 */ + {USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x331F, 0xff, 0xff, 0xff), .driver_info = RTL8822B}, /* Dlink - DWA-183 - D */ + {USB_DEVICE_AND_INTERFACE_INFO(0x20F4, 0x805A, 0xff, 0xff, 0xff), .driver_info = RTL8822B}, /* TRENDnet TEW-805UBH */ + {USB_DEVICE_AND_INTERFACE_INFO(0x20F4, 0x808A, 0xff, 0xff, 0xff), .driver_info = RTL8822B}, /* TRENDnet TEW-808UBM */ + {USB_DEVICE_AND_INTERFACE_INFO(0x2357, 0x0115, 0xff, 0xff, 0xff), .driver_info = RTL8822B}, /* TP-Link Archer T4U V3 */ + {USB_DEVICE_AND_INTERFACE_INFO(0x2357, 0x0116, 0xff, 0xff, 0xff), .driver_info = RTL8822B}, /* TP-LINK */ + {USB_DEVICE_AND_INTERFACE_INFO(0x2357, 0x0117, 0xff, 0xff, 0xff), .driver_info = RTL8822B}, /* TP-LINK */ + {USB_DEVICE_AND_INTERFACE_INFO(0x2357, 0x012D, 0xff, 0xff, 0xff), .driver_info = RTL8822B}, /* TP-Link Archer T3U v1 */ + {USB_DEVICE_AND_INTERFACE_INFO(0x2357, 0x012E, 0xff, 0xff, 0xff), .driver_info = RTL8822B}, /* TP-LINK */ + {USB_DEVICE_AND_INTERFACE_INFO(0x2357, 0x0138, 0xff, 0xff, 0xff), .driver_info = RTL8822B}, /* TP-Link Archer T3U Plus v1 */ + {USB_DEVICE_AND_INTERFACE_INFO(0x2C4E, 0x0107, 0xff, 0xff, 0xff), .driver_info = RTL8822B}, /* Mercusys MA30H */ {USB_DEVICE_AND_INTERFACE_INFO(0x7392, 0xB822, 0xff, 0xff, 0xff), .driver_info = RTL8822B}, /* Edimax */ {USB_DEVICE_AND_INTERFACE_INFO(0x7392, 0xC822, 0xff, 0xff, 0xff), .driver_info = RTL8822B}, /* Edimax */ {USB_DEVICE_AND_INTERFACE_INFO(0x7392, 0xD822, 0xff, 0xff, 0xff), .driver_info = RTL8822B}, /* Edimax */ {USB_DEVICE_AND_INTERFACE_INFO(0x7392, 0xE822, 0xff, 0xff, 0xff), .driver_info = RTL8822B}, /* Edimax */ {USB_DEVICE_AND_INTERFACE_INFO(0x7392, 0xF822, 0xff, 0xff, 0xff), .driver_info = RTL8822B}, /* Edimax */ - {USB_DEVICE_AND_INTERFACE_INFO(0x2357, 0x012D, 0xff, 0xff, 0xff), .driver_info = RTL8822B}, /* TP-Link Archer T3U v1 */ - {USB_DEVICE_AND_INTERFACE_INFO(0x2357, 0x0138, 0xff, 0xff, 0xff), .driver_info = RTL8822B}, /* TP-Link Archer T3U Plus v1 */ - {USB_DEVICE_AND_INTERFACE_INFO(0x2357, 0x0115, 0xff, 0xff, 0xff), .driver_info = RTL8822B}, /* TP-Link Archer T4U V3 */ - {USB_DEVICE_AND_INTERFACE_INFO(0x2357, 0x012E, 0xff, 0xff, 0xff), .driver_info = RTL8822B}, /* TP-LINK */ - {USB_DEVICE_AND_INTERFACE_INFO(0x2357, 0x0116, 0xff, 0xff, 0xff), .driver_info = RTL8822B}, /* TP-LINK */ - {USB_DEVICE_AND_INTERFACE_INFO(0x2357, 0x0117, 0xff, 0xff, 0xff), .driver_info = RTL8822B}, /* TP-LINK */ - {USB_DEVICE_AND_INTERFACE_INFO(0x0846, 0x9055, 0xff, 0xff, 0xff), .driver_info = RTL8822B}, /* Netgear A6150 */ - {USB_DEVICE_AND_INTERFACE_INFO(0x0b05, 0x1841, 0xff, 0xff, 0xff), .driver_info = RTL8822B}, /* ASUS AC1300 USB-AC55 B1 */ - {USB_DEVICE_AND_INTERFACE_INFO(0x0b05, 0x184C, 0xff, 0xff, 0xff), .driver_info = RTL8822B}, /* ASUS U2 */ - {USB_DEVICE_AND_INTERFACE_INFO(0x0B05, 0x19AA, 0xff, 0xff, 0xff), .driver_info = RTL8822B}, /* ASUS - USB-AC58 rev A1 */ - {USB_DEVICE_AND_INTERFACE_INFO(0x0B05, 0x1870, 0xff, 0xff, 0xff), .driver_info = RTL8822B}, /* ASUS */ - {USB_DEVICE_AND_INTERFACE_INFO(0x0B05, 0x1874, 0xff, 0xff, 0xff), .driver_info = RTL8822B}, /* ASUS */ - {USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x331E, 0xff, 0xff, 0xff), .driver_info = RTL8822B}, /* Dlink - DWA-181 */ - {USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x331C, 0xff, 0xff, 0xff), .driver_info = RTL8822B}, /* Dlink - DWA-182 - D1 */ - {USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x331F, 0xff, 0xff, 0xff), .driver_info = RTL8822B}, /* Dlink - DWA-183 - D */ - {USB_DEVICE_AND_INTERFACE_INFO(0x20F4, 0x805A, 0xff, 0xff, 0xff), .driver_info = RTL8822B}, /* TRENDnet TEW-805UBH */ - {USB_DEVICE_AND_INTERFACE_INFO(0x20F4, 0x808A, 0xff, 0xff, 0xff), .driver_info = RTL8822B}, /* TRENDnet TEW-808UBM */ - {USB_DEVICE_AND_INTERFACE_INFO(0x13B1, 0x0045, 0xff, 0xff, 0xff), .driver_info = RTL8822B}, /* Linksys WUSB3600 v2 */ - {USB_DEVICE_AND_INTERFACE_INFO(0x04CA, 0x8602, 0xff, 0xff, 0xff), .driver_info = RTL8822B}, /* LiteOn */ - {USB_DEVICE_AND_INTERFACE_INFO(0x0E66, 0x0025, 0xff, 0xff, 0xff), .driver_info = RTL8822B}, /* Hawking HW12ACU */ - {USB_DEVICE_AND_INTERFACE_INFO(0x13B1, 0x0043, 0xff, 0xff, 0xff), .driver_info = RTL8822B}, /* Alpha - Linksys */ - {USB_DEVICE_AND_INTERFACE_INFO(0x0BDA, 0x2102, 0xff, 0xff, 0xff), .driver_info = RTL8822B}, /* CCNC */ - {USB_DEVICE_AND_INTERFACE_INFO(0x056e, 0x4011, 0xff, 0xff, 0xff), .driver_info = RTL8822B}, /* Elecom */ #endif /* CONFIG_RTL8822B */ #ifdef CONFIG_RTL8723D diff --git a/supported-device-IDs b/supported-device-IDs index d25f662..5b68d34 100644 --- a/supported-device-IDs +++ b/supported-device-IDs @@ -12,43 +12,43 @@ ID VendorID:DeviceID = 0bda:b812 We can search the list of driver supported IDs shown below. -Realtek default IDs +Realtek default IDs (3) -ID 0BDA:B82C - Default ID for USB multi-function (such as WiFi plus bluetooth) ID 0BDA:B812 - Default ID for USB Single-function, WiFi only ID 0BDA:B81A - Default ID +ID 0BDA:B82C - Default ID for USB multi-function (such as WiFi plus bluetooth) -Seller specific IDs +Seller specific IDs (29) -ID 7392:B822 -ID 7392:C822 -ID 7392:D822 -ID 7392:E822 -ID 7392:F822 -ID 13b1:0043 -ID 2357:012D -ID 2357:0138 -ID 2357:0115 -ID 2357:012E -ID 2357:0116 -ID 2357:0117 -ID 0846:9055 -ID 0b05:1841 -ID 0B05:184C -ID 0B05:19AA -ID 0B05:1870 -ID 0B05:1874 -ID 2001:331E -ID 2001:331C -ID 2001:331F -ID 20F4:808A -ID 13B1:0045 -ID 04CA:8602 -ID 0E66:0025 -ID 13B1:0043 -ID 0BDA:2102 -ID 056E:4011 -ID 20F4:805A +ID 04CA:8602 /* LiteOn */ +ID 056E:4011 /* Elecom */ +ID 0846:9055 /* Netgear A6150 */ +ID 0B05:1841 /* ASUS AC1300 USB-AC55 B1 */ +ID 0B05:184C /* ASUS U2 */ +ID 0B05:1870 /* ASUS */ +ID 0B05:1874 /* ASUS */ +ID 0B05:19AA /* ASUS - USB-AC58 rev A1 */ +ID 0BDA:2102 /* CCNC */ +ID 0E66:0025 /* Hawking HW12ACU */ +ID 13B1:0043 /* Alpha - Linksys */ +ID 13B1:0045 /* Linksys WUSB3600 v2 */ +ID 2001:331E /* Dlink - DWA-182 - D1 */ +ID 2001:331C /* Dlink - DWA-181 */ +ID 2001:331F /* Dlink - DWA-183 - D */ +ID 20F4:805A /* TRENDnet TEW-805UBH */ +ID 20F4:808A /* TRENDnet TEW-808UBM */ +ID 2357:0115 /* TP-Link Archer T4U V3 */ +ID 2357:0116 /* TP-LINK */ +ID 2357:0117 /* TP-LINK */ +ID 2357:012D /* TP-Link Archer T3U v1 */ +ID 2357:012E /* TP-LINK */ +ID 2357:0138 /* TP-Link Archer T3U Plus v1 */ +ID 2C4E:0107 /* Mercusys MA30H */ +ID 7392:B822 /* Edimax */ +ID 7392:C822 /* Edimax */ +ID 7392:D822 /* Edimax */ +ID 7392:E822 /* Edimax */ +ID 7392:F822 /* Edimax */ If your adapter matches one of the default or seller specific IDs then this is the driver to use.