kernel/ral: Switch back to using pcidevs.h.
authorSascha Wildner <saw@online.de>
Fri, 2 May 2014 00:21:58 +0000 (02:21 +0200)
committerSascha Wildner <saw@online.de>
Fri, 2 May 2014 00:21:58 +0000 (02:21 +0200)
It was lost with feb94d24033db5d8fe8e5e4807103d48f3638ceb.

sys/bus/pci/pcidevs
sys/dev/netif/ral/Makefile
sys/dev/netif/ral/if_ral_pci.c

index a7c4316..d7db1da 100644 (file)
@@ -101,6 +101,7 @@ vendor LINKSYS              0x1737  Linksys
 vendor ALTIMA          0x173b  Altima
 vendor PEPPERCON       0x1743  Peppercon AG
 vendor BELKIN          0x1799  Belkin
+vendor RALINK          0x1814  Ralink Technologies
 vendor SILAN           0x1904  Hangzhou Silan Microelectronics
 vendor JMICRON         0x197b  JMicron Technology Corporation
 vendor ADDTRON         0x4033  Addtron Technology
index 3c8ae1d..8c34034 100644 (file)
@@ -1,7 +1,7 @@
 KMOD   = if_ral
 
 SRCS   = if_ral_pci.c rt2560.c rt2661.c
-SRCS   += device_if.h bus_if.h pci_if.h
+SRCS   += device_if.h bus_if.h pci_if.h pcidevs.h
 
 SUBDIR += fw
 
index 8fa405d..fe689a8 100644 (file)
@@ -47,6 +47,7 @@
 #include <netproto/802_11/ieee80211_radiotap.h>
 #include <netproto/802_11/ieee80211_amrr.h>
 
+#include "pcidevs.h"
 #include <bus/pci/pcireg.h>
 #include <bus/pci/pcivar.h>
 
@@ -65,10 +66,14 @@ struct ral_pci_ident {
 };
 
 static const struct ral_pci_ident ral_pci_ids[] = {
-       { 0x1814, 0x0201, "Ralink Technology RT2560" },
-       { 0x1814, 0x0301, "Ralink Technology RT2561S" },
-       { 0x1814, 0x0302, "Ralink Technology RT2561" },
-       { 0x1814, 0x0401, "Ralink Technology RT2661" },
+       { PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT2560,
+               "Ralink Technology RT2560" },
+       { PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT2561S,
+               "Ralink Technology RT2561S" },
+       { PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT2561,
+               "Ralink Technology RT2561" },
+       { PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT2661,
+               "Ralink Technology RT2661" },
 
        { 0, 0, NULL }
 };