diff options
author | Frank Mori Hess <fmhess@users.sourceforge.net> | 2009-09-21 16:10:21 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-10-09 16:47:25 -0400 |
commit | ecb8486da36c5359eb910674c15c324f0157e43f (patch) | |
tree | 9143b9f7f0c81d8c6d112d6659ce6730ed497327 /drivers | |
parent | 078a10df24ac87d18c2d52fb501ff652f481fb5b (diff) |
Staging: comedi: ni_pcimio: Added device id for pxi-6225.
Signed-off-by: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/staging/comedi/drivers/ni_pcimio.c | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/drivers/staging/comedi/drivers/ni_pcimio.c b/drivers/staging/comedi/drivers/ni_pcimio.c index 19d87553d906..24c8b8ed5b4c 100644 --- a/drivers/staging/comedi/drivers/ni_pcimio.c +++ b/drivers/staging/comedi/drivers/ni_pcimio.c | |||
@@ -29,7 +29,7 @@ Devices: [National Instruments] PCI-MIO-16XE-50 (ni_pcimio), | |||
29 | PCI-MIO-16XE-10, PXI-6030E, PCI-MIO-16E-1, PCI-MIO-16E-4, PCI-6014, PCI-6040E, | 29 | PCI-MIO-16XE-10, PXI-6030E, PCI-MIO-16E-1, PCI-MIO-16E-4, PCI-6014, PCI-6040E, |
30 | PXI-6040E, PCI-6030E, PCI-6031E, PCI-6032E, PCI-6033E, PCI-6071E, PCI-6023E, | 30 | PXI-6040E, PCI-6030E, PCI-6031E, PCI-6032E, PCI-6033E, PCI-6071E, PCI-6023E, |
31 | PCI-6024E, PCI-6025E, PXI-6025E, PCI-6034E, PCI-6035E, PCI-6052E, | 31 | PCI-6024E, PCI-6025E, PXI-6025E, PCI-6034E, PCI-6035E, PCI-6052E, |
32 | PCI-6110, PCI-6111, PCI-6220, PCI-6221, PCI-6224, PXI-6224, PCI-6225, | 32 | PCI-6110, PCI-6111, PCI-6220, PCI-6221, PCI-6224, PXI-6224, PCI-6225, PXI-6225, |
33 | PCI-6229, PCI-6250, PCI-6251, PCIe-6251, PCI-6254, PCI-6259, PCIe-6259, | 33 | PCI-6229, PCI-6250, PCI-6251, PCIe-6251, PCI-6254, PCI-6259, PCIe-6259, |
34 | PCI-6280, PCI-6281, PXI-6281, PCI-6284, PCI-6289, | 34 | PCI-6280, PCI-6281, PXI-6281, PCI-6284, PCI-6289, |
35 | PCI-6711, PXI-6711, PCI-6713, PXI-6713, | 35 | PCI-6711, PXI-6711, PCI-6713, PXI-6713, |
@@ -179,6 +179,7 @@ static DEFINE_PCI_DEVICE_TABLE(ni_pci_table) = { | |||
179 | PCI_VENDOR_ID_NATINST, 0x70f2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, { | 179 | PCI_VENDOR_ID_NATINST, 0x70f2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, { |
180 | PCI_VENDOR_ID_NATINST, 0x710d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, { | 180 | PCI_VENDOR_ID_NATINST, 0x710d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, { |
181 | PCI_VENDOR_ID_NATINST, 0x716c, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, { | 181 | PCI_VENDOR_ID_NATINST, 0x716c, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, { |
182 | PCI_VENDOR_ID_NATINST, 0x716d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, { | ||
182 | PCI_VENDOR_ID_NATINST, 0x717f, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, { | 183 | PCI_VENDOR_ID_NATINST, 0x717f, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, { |
183 | PCI_VENDOR_ID_NATINST, 0x71bc, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, { | 184 | PCI_VENDOR_ID_NATINST, 0x71bc, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, { |
184 | PCI_VENDOR_ID_NATINST, 0x717d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, { | 185 | PCI_VENDOR_ID_NATINST, 0x717d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, { |
@@ -953,6 +954,25 @@ static const struct ni_board_struct ni_boards[] = { | |||
953 | .has_8255 = 0, | 954 | .has_8255 = 0, |
954 | }, | 955 | }, |
955 | { | 956 | { |
957 | .device_id = 0x716d, | ||
958 | .name = "pxi-6225", | ||
959 | .n_adchan = 80, | ||
960 | .adbits = 16, | ||
961 | .ai_fifo_depth = 4095, | ||
962 | .gainlkup = ai_gain_622x, | ||
963 | .ai_speed = 4000, | ||
964 | .n_aochan = 2, | ||
965 | .aobits = 16, | ||
966 | .ao_fifo_depth = 8191, | ||
967 | .ao_range_table = &range_ni_M_622x_ao, | ||
968 | .reg_type = ni_reg_622x, | ||
969 | .ao_unipolar = 0, | ||
970 | .ao_speed = 1200, | ||
971 | .num_p0_dio_channels = 32, | ||
972 | .caldac = {caldac_none}, | ||
973 | .has_8255 = 0, | ||
974 | }, | ||
975 | { | ||
956 | .device_id = 0x70aa, | 976 | .device_id = 0x70aa, |
957 | .name = "pci-6229", | 977 | .name = "pci-6229", |
958 | .n_adchan = 32, | 978 | .n_adchan = 32, |