Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 586b9839 authored by Ian Abbott's avatar Ian Abbott Committed by Greg Kroah-Hartman
Browse files

staging: comedi: ni_pcimio: Add support for NI PXIe-6251 



Paul Fulmek reports that PXIe-6251 works the same as the existing
PCIe-6251 and just needs the new PCI device ID adding to ni_pci_table[]
and a new entry adding to ni_boards[] based on the existing entry for
PCIe-6251.

The new entry has PCI device ID 0x72e8 and board name "pxie-6251".

Thanks Paul!

Signed-off-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2e254212

drivers/staging/comedi/drivers/ni_pcimio.c

+24 −3
Original line number Diff line number Diff line
@@ -29,14 +29,15 @@ Devices: [National Instruments] PCI-MIO-16XE-50 (ni_pcimio), 
  PCI-MIO-16XE-10, PXI-6030E, PCI-MIO-16E-1, PCI-MIO-16E-4, PCI-6014, PCI-6040E,

  PXI-6040E, PCI-6030E, PCI-6031E, PCI-6032E, PCI-6033E, PCI-6071E, PCI-6023E,

  PCI-6024E, PCI-6025E, PXI-6025E, PCI-6034E, PCI-6035E, PCI-6052E,

  PCI-6110, PCI-6111, PCI-6220, PCI-6221, PCI-6224, PXI-6224, PCI-6225, PXI-6225,

  PCI-6229, PCI-6250, PCI-6251, PCIe-6251, PCI-6254, PCI-6259, PCIe-6259,

  PCI-6110, PCI-6111, PCI-6220, PCI-6221, PCI-6224, PXI-6224,

  PCI-6225, PXI-6225, PCI-6229, PCI-6250, PCI-6251, PCIe-6251, PXIe-6251,

  PCI-6254, PCI-6259, PCIe-6259,

  PCI-6280, PCI-6281, PXI-6281, PCI-6284, PCI-6289,

  PCI-6711, PXI-6711, PCI-6713, PXI-6713,

  PXI-6071E, PCI-6070E, PXI-6070E,

  PXI-6052E, PCI-6036E, PCI-6731, PCI-6733, PXI-6733,

  PCI-6143, PXI-6143

Updated: Wed, 03 Dec 2008 10:51:47 +0000

Updated: Mon, 09 Jan 2012 14:52:48 +0000



These boards are almost identical to the AT-MIO E series, except that

they use the PCI bus instead of ISA (i.e., AT).  See the notes for
@@ -182,6 +183,7 @@ static DEFINE_PCI_DEVICE_TABLE(ni_pci_table) = { 
	{PCI_DEVICE(PCI_VENDOR_ID_NI, 0x717f)},

	{PCI_DEVICE(PCI_VENDOR_ID_NI, 0x71bc)},

	{PCI_DEVICE(PCI_VENDOR_ID_NI, 0x717d)},

	{PCI_DEVICE(PCI_VENDOR_ID_NI, 0x72e8)},

	{0}

};
@@ -1045,6 +1047,25 @@ static const struct ni_board_struct ni_boards[] = { 
	 .caldac = {caldac_none},

	 .has_8255 = 0,

	 },

	{

	 .device_id = 0x72e8,

	 .name = "pxie-6251",

	 .n_adchan = 16,

	 .adbits = 16,

	 .ai_fifo_depth = 4095,

	 .gainlkup = ai_gain_628x,

	 .ai_speed = 800,

	 .n_aochan = 2,

	 .aobits = 16,

	 .ao_fifo_depth = 8191,

	 .ao_range_table = &range_ni_M_625x_ao,

	 .reg_type = ni_reg_625x,

	 .ao_unipolar = 0,

	 .ao_speed = 357,

	 .num_p0_dio_channels = 8,

	 .caldac = {caldac_none},

	 .has_8255 = 0,

	 },

	{

	 .device_id = 0x70b7,

	 .name = "pci-6254",