diff options
author | Ruben Smits <ruben.smits@mech.kuleuven.be> | 2010-12-11 02:26:18 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-12-13 13:25:54 -0500 |
commit | 6292817d58637f85dd623cfe563c7f5ec4f4c470 (patch) | |
tree | 3827865db248212e9e13594b1728c324f25496c1 | |
parent | ed271e049d4e0bf8c6586c9626964a01d1c62fa2 (diff) |
staging: comedi: add support for newer jr3 1-channel pci board
add DEVICE_ID to table
Signed-off-by: Ruben Smits <ruben.smits@mech.kuleuven.be>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/staging/comedi/drivers/jr3_pci.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/staging/comedi/drivers/jr3_pci.c b/drivers/staging/comedi/drivers/jr3_pci.c index 8b383ee959b..5c6c7274416 100644 --- a/drivers/staging/comedi/drivers/jr3_pci.c +++ b/drivers/staging/comedi/drivers/jr3_pci.c | |||
@@ -54,6 +54,7 @@ Devices: [JR3] PCI force sensor board (jr3_pci) | |||
54 | 54 | ||
55 | #define PCI_VENDOR_ID_JR3 0x1762 | 55 | #define PCI_VENDOR_ID_JR3 0x1762 |
56 | #define PCI_DEVICE_ID_JR3_1_CHANNEL 0x3111 | 56 | #define PCI_DEVICE_ID_JR3_1_CHANNEL 0x3111 |
57 | #define PCI_DEVICE_ID_JR3_1_CHANNEL_NEW 0x1111 | ||
57 | #define PCI_DEVICE_ID_JR3_2_CHANNEL 0x3112 | 58 | #define PCI_DEVICE_ID_JR3_2_CHANNEL 0x3112 |
58 | #define PCI_DEVICE_ID_JR3_3_CHANNEL 0x3113 | 59 | #define PCI_DEVICE_ID_JR3_3_CHANNEL 0x3113 |
59 | #define PCI_DEVICE_ID_JR3_4_CHANNEL 0x3114 | 60 | #define PCI_DEVICE_ID_JR3_4_CHANNEL 0x3114 |
@@ -73,6 +74,8 @@ static DEFINE_PCI_DEVICE_TABLE(jr3_pci_pci_table) = { | |||
73 | { | 74 | { |
74 | PCI_VENDOR_ID_JR3, PCI_DEVICE_ID_JR3_1_CHANNEL, | 75 | PCI_VENDOR_ID_JR3, PCI_DEVICE_ID_JR3_1_CHANNEL, |
75 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, { | 76 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, { |
77 | PCI_VENDOR_ID_JR3, PCI_DEVICE_ID_JR3_1_CHANNEL_NEW, | ||
78 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, { | ||
76 | PCI_VENDOR_ID_JR3, PCI_DEVICE_ID_JR3_2_CHANNEL, | 79 | PCI_VENDOR_ID_JR3, PCI_DEVICE_ID_JR3_2_CHANNEL, |
77 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, { | 80 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, { |
78 | PCI_VENDOR_ID_JR3, PCI_DEVICE_ID_JR3_3_CHANNEL, | 81 | PCI_VENDOR_ID_JR3, PCI_DEVICE_ID_JR3_3_CHANNEL, |
@@ -807,6 +810,10 @@ static int jr3_pci_attach(struct comedi_device *dev, | |||
807 | devpriv->n_channels = 1; | 810 | devpriv->n_channels = 1; |
808 | } | 811 | } |
809 | break; | 812 | break; |
813 | case PCI_DEVICE_ID_JR3_1_CHANNEL_NEW:{ | ||
814 | devpriv->n_channels = 1; | ||
815 | } | ||
816 | break; | ||
810 | case PCI_DEVICE_ID_JR3_2_CHANNEL:{ | 817 | case PCI_DEVICE_ID_JR3_2_CHANNEL:{ |
811 | devpriv->n_channels = 2; | 818 | devpriv->n_channels = 2; |
812 | } | 819 | } |