staging: comedi: ni_660x: Support PCI-6224
Add support for the NI PCI-6224 board, assuming it behaves like the NI PXI-6224 board at the register level. The PCI device ID comes from the "nitiowv.inf" file in National Instrument's Windows drivers. Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
4463c3e72d
commit
0d0ad8298d
|
@ -1025,7 +1025,7 @@ config COMEDI_NI_660X
|
|||
select COMEDI_NI_TIOCMD
|
||||
---help---
|
||||
Enable support for National Instruments PCI-6601 (ni_660x), PCI-6602,
|
||||
PXI-6602, PXI-6608 and PXI-6624.
|
||||
PXI-6602, PXI-6608, PCI-6624, and PXI-6624.
|
||||
|
||||
To compile this driver as a module, choose M here: the module will be
|
||||
called ni_660x.
|
||||
|
|
|
@ -16,13 +16,13 @@
|
|||
* Driver: ni_660x
|
||||
* Description: National Instruments 660x counter/timer boards
|
||||
* Devices: [National Instruments] PCI-6601 (ni_660x), PCI-6602, PXI-6602,
|
||||
* PXI-6608, PXI-6624
|
||||
* PXI-6608, PCI-6624, 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>
|
||||
* Updated: Fri, 15 Mar 2013 10:47:56 +0000
|
||||
* Updated: Mon, 16 Jan 2017 14:00:43 +0000
|
||||
* Status: experimental
|
||||
*
|
||||
* Encoders work. PulseGeneration (both single pulse and pulse train)
|
||||
|
@ -211,6 +211,7 @@ enum ni_660x_boardid {
|
|||
BOARD_PCI6602,
|
||||
BOARD_PXI6602,
|
||||
BOARD_PXI6608,
|
||||
BOARD_PCI6624,
|
||||
BOARD_PXI6624
|
||||
};
|
||||
|
||||
|
@ -236,6 +237,10 @@ static const struct ni_660x_board ni_660x_boards[] = {
|
|||
.name = "PXI-6608",
|
||||
.n_chips = 2,
|
||||
},
|
||||
[BOARD_PCI6624] = {
|
||||
.name = "PCI-6624",
|
||||
.n_chips = 2,
|
||||
},
|
||||
[BOARD_PXI6624] = {
|
||||
.name = "PXI-6624",
|
||||
.n_chips = 2,
|
||||
|
@ -920,6 +925,7 @@ static const struct pci_device_id ni_660x_pci_table[] = {
|
|||
{ PCI_VDEVICE(NI, 0x1360), BOARD_PXI6602 },
|
||||
{ PCI_VDEVICE(NI, 0x2c60), BOARD_PCI6601 },
|
||||
{ PCI_VDEVICE(NI, 0x2cc0), BOARD_PXI6608 },
|
||||
{ PCI_VDEVICE(NI, 0x1e30), BOARD_PCI6624 },
|
||||
{ PCI_VDEVICE(NI, 0x1e40), BOARD_PXI6624 },
|
||||
{ 0 }
|
||||
};
|
||||
|
|
Loading…
Reference in New Issue