projects
/
comedi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
65265f3
)
ni_660x.c: PCI ids for NI PXI 6624 board
author
Florent Boudet
<flboudet@gmail.com>
Thu, 14 Mar 2013 11:00:00 +0000
(11:00 +0000)
committer
Ian Abbott
<abbotti@mev.co.uk>
Thu, 14 Mar 2013 11:00:00 +0000
(11:00 +0000)
I have successfuly used a NI PXI 6624 board with the ni_660x driver.
This board is basically the same as the 6602, with isolated channels and
external voltage source.
Here is a patch to apply to ni_660x.c to add the PCI identifiants for
this board.
comedi/drivers/ni_660x.c
patch
|
blob
|
history
diff --git
a/comedi/drivers/ni_660x.c
b/comedi/drivers/ni_660x.c
index 35caf9875bea4569e7b2bb7c6ee12f7ae1108cbc..e243447b1719ad2342f1a969352a32941d4343df 100644
(file)
--- a/
comedi/drivers/ni_660x.c
+++ b/
comedi/drivers/ni_660x.c
@@
-22,13
+22,13
@@
Driver: ni_660x
Description: National Instruments 660x counter/timer boards
Devices:
[National Instruments] PCI-6601 (ni_660x), PCI-6602, PXI-6602,
Description: National Instruments 660x counter/timer boards
Devices:
[National Instruments] PCI-6601 (ni_660x), PCI-6602, PXI-6602,
- PXI-6608
+ PXI-6608
, PXI-6624
Author: J.P. Mellor <jpmellor@rose-hulman.edu>,
Herman.Bruyninckx@mech.kuleuven.ac.be,
Wim.Meeussen@mech.kuleuven.ac.be,
Klaas.Gadeyne@mech.kuleuven.ac.be,
Frank Mori Hess <fmhess@users.sourceforge.net>
Author: J.P. Mellor <jpmellor@rose-hulman.edu>,
Herman.Bruyninckx@mech.kuleuven.ac.be,
Wim.Meeussen@mech.kuleuven.ac.be,
Klaas.Gadeyne@mech.kuleuven.ac.be,
Frank Mori Hess <fmhess@users.sourceforge.net>
-Updated: Thu
Oct 18 12:56:06 EDT 2007
+Updated: Thu
, 14 Mar 2013 10:57:02 +0000
Status: experimental
Encoders work. PulseGeneration (both single pulse and pulse train)
Status: experimental
Encoders work. PulseGeneration (both single pulse and pulse train)
@@
-404,6
+404,11
@@
static const ni_660x_board ni_660x_boards[] = {
name: "PXI-6608",
n_chips: 2,
},
name: "PXI-6608",
n_chips: 2,
},
+ {
+ dev_id: 0x1e40,
+ name: "PXI-6624",
+ n_chips: 2,
+ },
};
#define NI_660X_MAX_NUM_CHIPS 2
};
#define NI_660X_MAX_NUM_CHIPS 2
@@
-414,6
+419,7
@@
static DEFINE_PCI_DEVICE_TABLE(ni_660x_pci_table) = {
{PCI_VENDOR_ID_NATINST, 0x1310, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
{PCI_VENDOR_ID_NATINST, 0x1360, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
{PCI_VENDOR_ID_NATINST, 0x2cc0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
{PCI_VENDOR_ID_NATINST, 0x1310, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
{PCI_VENDOR_ID_NATINST, 0x1360, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
{PCI_VENDOR_ID_NATINST, 0x2cc0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+ {PCI_VENDOR_ID_NATINST, 0x1e40, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
{0}
};
{0}
};