Commit 02225891 authored by Ruben Smits's avatar Ruben Smits Committed by Greg Kroah-Hartman

staging: comedi: add support for newer jr3 1-channel pci board

commit 6292817d upstream.

add DEVICE_ID to table
Signed-off-by: default avatarRuben Smits <ruben.smits@mech.kuleuven.be>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 95db1c74
...@@ -54,6 +54,7 @@ Devices: [JR3] PCI force sensor board (jr3_pci) ...@@ -54,6 +54,7 @@ Devices: [JR3] PCI force sensor board (jr3_pci)
#define PCI_VENDOR_ID_JR3 0x1762 #define PCI_VENDOR_ID_JR3 0x1762
#define PCI_DEVICE_ID_JR3_1_CHANNEL 0x3111 #define PCI_DEVICE_ID_JR3_1_CHANNEL 0x3111
#define PCI_DEVICE_ID_JR3_1_CHANNEL_NEW 0x1111
#define PCI_DEVICE_ID_JR3_2_CHANNEL 0x3112 #define PCI_DEVICE_ID_JR3_2_CHANNEL 0x3112
#define PCI_DEVICE_ID_JR3_3_CHANNEL 0x3113 #define PCI_DEVICE_ID_JR3_3_CHANNEL 0x3113
#define PCI_DEVICE_ID_JR3_4_CHANNEL 0x3114 #define PCI_DEVICE_ID_JR3_4_CHANNEL 0x3114
...@@ -73,6 +74,8 @@ static DEFINE_PCI_DEVICE_TABLE(jr3_pci_pci_table) = { ...@@ -73,6 +74,8 @@ static DEFINE_PCI_DEVICE_TABLE(jr3_pci_pci_table) = {
{ {
PCI_VENDOR_ID_JR3, PCI_DEVICE_ID_JR3_1_CHANNEL, PCI_VENDOR_ID_JR3, PCI_DEVICE_ID_JR3_1_CHANNEL,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, { PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
PCI_VENDOR_ID_JR3, PCI_DEVICE_ID_JR3_1_CHANNEL_NEW,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
PCI_VENDOR_ID_JR3, PCI_DEVICE_ID_JR3_2_CHANNEL, PCI_VENDOR_ID_JR3, PCI_DEVICE_ID_JR3_2_CHANNEL,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, { PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
PCI_VENDOR_ID_JR3, PCI_DEVICE_ID_JR3_3_CHANNEL, PCI_VENDOR_ID_JR3, PCI_DEVICE_ID_JR3_3_CHANNEL,
...@@ -807,6 +810,10 @@ static int jr3_pci_attach(struct comedi_device *dev, ...@@ -807,6 +810,10 @@ static int jr3_pci_attach(struct comedi_device *dev,
devpriv->n_channels = 1; devpriv->n_channels = 1;
} }
break; break;
case PCI_DEVICE_ID_JR3_1_CHANNEL_NEW:{
devpriv->n_channels = 1;
}
break;
case PCI_DEVICE_ID_JR3_2_CHANNEL:{ case PCI_DEVICE_ID_JR3_2_CHANNEL:{
devpriv->n_channels = 2; devpriv->n_channels = 2;
} }
......
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