Module Name: src Committed By: christos Date: Wed Jul 6 14:28:51 UTC 2016
Modified Files: src/sys/dev/pci: if_ral_pci.c Log Message: more cards, sort. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/sys/dev/pci/if_ral_pci.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/pci/if_ral_pci.c diff -u src/sys/dev/pci/if_ral_pci.c:1.22 src/sys/dev/pci/if_ral_pci.c:1.23 --- src/sys/dev/pci/if_ral_pci.c:1.22 Wed Apr 27 15:47:25 2016 +++ src/sys/dev/pci/if_ral_pci.c Wed Jul 6 10:28:51 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: if_ral_pci.c,v 1.22 2016/04/27 19:47:25 christos Exp $ */ +/* $NetBSD: if_ral_pci.c,v 1.23 2016/07/06 14:28:51 christos Exp $ */ /* $OpenBSD: if_ral_pci.c,v 1.24 2015/11/24 17:11:39 mpi Exp $ */ /*- @@ -21,7 +21,7 @@ * PCI front-end for the Ralink RT2560/RT2561/RT2860/RT3090 driver. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ral_pci.c,v 1.22 2016/04/27 19:47:25 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ral_pci.c,v 1.23 2016/07/06 14:28:51 christos Exp $"); #include <sys/param.h> @@ -130,14 +130,6 @@ static const struct ral_pci_matchid { pci_vendor_id_t ral_vendor; pci_product_id_t ral_product; } ral_pci_devices[] = { - { PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT2560 }, - { PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT2561 }, - { PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT2561S }, - { PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT2661 }, - { PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT2860 }, - { PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT2890 }, - { PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT2760 }, - { PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT2790 }, { PCI_VENDOR_AWT, PCI_PRODUCT_AWT_RT2890 }, { PCI_VENDOR_EDIMAX, PCI_PRODUCT_EDIMAX_RT2860_1 }, { PCI_VENDOR_EDIMAX, PCI_PRODUCT_EDIMAX_RT2860_2 }, @@ -146,6 +138,17 @@ static const struct ral_pci_matchid { { PCI_VENDOR_EDIMAX, PCI_PRODUCT_EDIMAX_RT2860_5 }, { PCI_VENDOR_EDIMAX, PCI_PRODUCT_EDIMAX_RT2860_6 }, { PCI_VENDOR_EDIMAX, PCI_PRODUCT_EDIMAX_RT2860_7 }, + { PCI_VENDOR_EDIMAX, PCI_PRODUCT_EDIMAX_RT3591_1 }, + { PCI_VENDOR_EDIMAX, PCI_PRODUCT_EDIMAX_RT3591_2 }, + { PCI_VENDOR_MSI, PCI_PRODUCT_AWT_RT2890 }, + { PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT2560 }, + { PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT2561 }, + { PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT2561S }, + { PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT2661 }, + { PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT2760 }, + { PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT2790 }, + { PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT2860 }, + { PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT2890 }, { PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT3060 }, { PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT3062 }, { PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT3090 }, @@ -153,7 +156,14 @@ static const struct ral_pci_matchid { { PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT3092 }, { 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_RT3593 }, + { PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT5360 }, + { PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT5362 }, + { PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT5390_1 }, + { PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT5390_2 }, + { PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT5390_3 }, + { PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT5390_4 }, + { PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT5390_5 }, }; int