On Mon, May 22, 2017 at 03:50:27PM +1000, Jonathan Gray wrote:
>
> On Mon, May 22, 2017 at 01:13:34PM +0800, Kevin Lo wrote:
> > Hi,
> >
> > The diff below adds D-Link DWA-525 rev A2 to ral(4) which works fine on
> > amd64
> > and update ral(4) manpage.
>
> This could also add other missing ids.
>
> RALINK
> 0x3390 (RT33XX)
> 0x359f (RT35XX)
> 0x5362 (RT53XX)
>
> EDIMAX
> 0x7711 (RT35XX)
> 0x7722 (RT35XX)
If we want to add those missing ids, rt2860_get_rf() function needs to be
updated as well. Since I don't have those chips, I'm not sure if they work.
>
> You don't need to change $Mdocdate$, that gets expanded automatically.
Ok, here's the revised patch, thanks.
Index: share/man/man4/ral.4
===================================================================
RCS file: /cvs/src/share/man/man4/ral.4,v
retrieving revision 1.110
diff -u -p -u -p -r1.110 ral.4
--- share/man/man4/ral.4 17 Aug 2016 11:52:29 -0000 1.110
+++ share/man/man4/ral.4 22 May 2017 06:04:03 -0000
@@ -160,6 +160,7 @@ CNet CWP-854.
Compex WLP54G.
Conceptronic C54Ri.
Corega CG-WLPCI54GL.
+D-Link DWA-525 rev A2.
Digitus DN-7006G-RA.
Dynalink WLG25PCI.
E-Tech WGPI02.
Index: sys/dev/ic/rt2860.c
===================================================================
RCS file: /cvs/src/sys/dev/ic/rt2860.c,v
retrieving revision 1.92
diff -u -p -u -p -r1.92 rt2860.c
--- sys/dev/ic/rt2860.c 22 Jan 2017 10:17:38 -0000 1.92
+++ sys/dev/ic/rt2860.c 22 May 2017 06:04:06 -0000
@@ -3106,6 +3106,7 @@ rt2860_get_rf(uint16_t rev)
case RT3070_RF_3052: return "RT3052";
case RT3070_RF_3320: return "RT3320";
case RT3070_RF_3053: return "RT3053";
+ case RT5390_RF_5360: return "RT5360";
case RT5390_RF_5390: return "RT5390";
case RT5390_RF_5392: return "RT5392";
default: return "unknown";
Index: sys/dev/ic/rt2860reg.h
===================================================================
RCS file: /cvs/src/sys/dev/ic/rt2860reg.h,v
retrieving revision 1.33
diff -u -p -u -p -r1.33 rt2860reg.h
--- sys/dev/ic/rt2860reg.h 17 Aug 2016 11:50:52 -0000 1.33
+++ sys/dev/ic/rt2860reg.h 22 May 2017 06:04:06 -0000
@@ -925,6 +925,7 @@ struct rt2860_rxwi {
#define RT3070_RF_3320 0x000b /* 1T1R */
#define RT3070_RF_3053 0x000d /* dual-band 3T3R */
#define RT5592_RF_5592 0x000f /* dual-band 2T2R */
+#define RT5390_RF_5360 0x5360 /* 1T1R */
#define RT5390_RF_5370 0x5370 /* 1T1R */
#define RT5390_RF_5372 0x5372 /* 2T2R */
#define RT5390_RF_5390 0x5390 /* 1T1R */
Index: sys/dev/pci/if_ral_pci.c
===================================================================
RCS file: /cvs/src/sys/dev/pci/if_ral_pci.c,v
retrieving revision 1.25
diff -u -p -u -p -r1.25 if_ral_pci.c
--- sys/dev/pci/if_ral_pci.c 17 Aug 2016 11:50:52 -0000 1.25
+++ sys/dev/pci/if_ral_pci.c 22 May 2017 06:04:07 -0000
@@ -136,6 +136,7 @@ const struct pci_matchid ral_pci_devices
{ PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT3562 },
{ PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT3592 },
{ PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT3593 },
+ { PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT5360 },
{ PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT5390 },
{ PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT5392 },
{ PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT5390_1 },
Index: sys/dev/pci/pcidevs
===================================================================
RCS file: /cvs/src/sys/dev/pci/pcidevs,v
retrieving revision 1.1818
diff -u -p -u -p -r1.1818 pcidevs
--- sys/dev/pci/pcidevs 17 May 2017 05:00:17 -0000 1.1818
+++ sys/dev/pci/pcidevs 22 May 2017 06:04:08 -0000
@@ -6560,6 +6560,7 @@ product RALINK RT3298 0x3298 Bluetooth
product RALINK RT3562 0x3562 RT3562
product RALINK RT3592 0x3592 RT3592
product RALINK RT3593 0x3593 RT3593
+product RALINK RT5360 0x5360 RT5360
product RALINK RT5390 0x5390 RT5390
product RALINK RT5392 0x5392 RT5392
product RALINK RT5390_1 0x539a RT5390
