Skip to content

P
Production Test Suite - base
Commit 38a46724 authored by Samuel Iglesias Gonsalvez's avatar Samuel Iglesias Gonsalvez
Browse files
Options

gnurabbit: added old patch about CERN VENDOR ID/DEVICE ID to the new driver

parent 4fb69ddf
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 1 deletion
gnurabbit/kernel/rawrabbit-core.c
View file @ 38a46724
...@@ -62,7 +62,7 @@ irqreturn_t rr_interrupt(int irq, void *devid) ...@@ -62,7 +62,7 @@ irqreturn_t rr_interrupt(int irq, void *devid)
* One device id only is supported. * One device id only is supported.
*/ */
static struct pci_device_id rr_idtable[2]; /* last must be zero */ static struct pci_device_id rr_idtable[3]; /* last must be zero */
static void rr_fill_table(struct rr_dev *dev) static void rr_fill_table(struct rr_dev *dev)
{ {
...@@ -75,6 +75,12 @@ static void rr_fill_table(struct rr_dev *dev) ...@@ -75,6 +75,12 @@ static void rr_fill_table(struct rr_dev *dev)
} }
dev->id_table->vendor = dev->devsel->vendor; dev->id_table->vendor = dev->devsel->vendor;
dev->id_table->device = dev->devsel->device; dev->id_table->device = dev->devsel->device;
dev->id_table[1].vendor = RR_CERN_VENDOR;
dev->id_table[1].device = RR_CERN_DEVICE;
dev->id_table[1].subvendor = PCI_ANY_ID;
dev->id_table[1].subdevice = PCI_ANY_ID;
} }
static int rr_fill_table_and_probe(struct rr_dev *dev) static int rr_fill_table_and_probe(struct rr_dev *dev)
......
gnurabbit/kernel/rawrabbit.h
View file @ 38a46724
...@@ -58,6 +58,8 @@ extern void rr_load_firmware(struct work_struct *work); ...@@ -58,6 +58,8 @@ extern void rr_load_firmware(struct work_struct *work);
/* By default, the driver registers for this vendor/devid */ /* By default, the driver registers for this vendor/devid */
#define RR_DEFAULT_VENDOR 0x1a39 #define RR_DEFAULT_VENDOR 0x1a39
#define RR_DEFAULT_DEVICE 0x0004 #define RR_DEFAULT_DEVICE 0x0004
#define RR_CERN_VENDOR 0x10dc
#define RR_CERN_DEVICE 0x018d
#define RR_DEFAULT_FWNAME "rrabbit-%P-%p@%b" #define RR_DEFAULT_FWNAME "rrabbit-%P-%p@%b"
#define RR_MAX_FWNAME_SIZE 64 #define RR_MAX_FWNAME_SIZE 64
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment