From 59ca58cc05017591e3f325a47d6b877e696c2992 Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Fri, 2 May 2014 02:21:58 +0200 Subject: [PATCH] kernel/ral: Switch back to using pcidevs.h. It was lost with feb94d24033db5d8fe8e5e4807103d48f3638ceb. --- sys/bus/pci/pcidevs | 1 + sys/dev/netif/ral/Makefile | 2 +- sys/dev/netif/ral/if_ral_pci.c | 13 +++++++++---- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/sys/bus/pci/pcidevs b/sys/bus/pci/pcidevs index a7c4316f20..d7db1dadbe 100644 --- a/sys/bus/pci/pcidevs +++ b/sys/bus/pci/pcidevs @@ -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 diff --git a/sys/dev/netif/ral/Makefile b/sys/dev/netif/ral/Makefile index 3c8ae1d773..8c340346dd 100644 --- a/sys/dev/netif/ral/Makefile +++ b/sys/dev/netif/ral/Makefile @@ -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 diff --git a/sys/dev/netif/ral/if_ral_pci.c b/sys/dev/netif/ral/if_ral_pci.c index 8fa405da16..fe689a8afc 100644 --- a/sys/dev/netif/ral/if_ral_pci.c +++ b/sys/dev/netif/ral/if_ral_pci.c @@ -47,6 +47,7 @@ #include #include +#include "pcidevs.h" #include #include @@ -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 } }; -- 2.41.0