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

Commit 68278f10 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

staging: comedi: ni_pcimio: cleanup the boardinfo



For aesthetic reasons, add some whitespace to the boardinfo.

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f5a1d92b
Loading
Loading
Loading
Loading
+762 −901
Original line number Diff line number Diff line
@@ -234,13 +234,10 @@ static const struct ni_board_struct ni_boards[] = {
		.ai_speed	= 50000,
		.n_aochan	= 2,
		.aobits		= 12,
	 .ao_fifo_depth = 0,
		.ao_range_table	= &range_bipolar10,
	 .ao_unipolar = 0,
		.ao_speed	= 50000,
		.num_p0_dio_channels = 8,
		.caldac		= { dac8800, dac8043 },
	 .has_8255 = 0,
	},
	[BOARD_PCIMIO_16XE_10] = {
		.name		= "pci-mio-16xe-10",	/*  aka pci-6030E */
@@ -258,7 +255,6 @@ static const struct ni_board_struct ni_boards[] = {
		.ao_speed	= 10000,
		.num_p0_dio_channels = 8,
		.caldac		= { dac8800, dac8043, ad8522 },
	 .has_8255 = 0,
	},
	[BOARD_PCI6014] = {
		.name		= "pci-6014",
@@ -270,13 +266,10 @@ static const struct ni_board_struct ni_boards[] = {
		.ai_speed	= 5000,
		.n_aochan	= 2,
		.aobits		= 16,
	 .ao_fifo_depth = 0,
		.ao_range_table	= &range_bipolar10,
	 .ao_unipolar = 0,
		.ao_speed	= 100000,
		.num_p0_dio_channels = 8,
		.caldac		= { ad8804_debug },
	 .has_8255 = 0,
	},
	[BOARD_PXI6030E] = {
		.name		= "pxi-6030e",
@@ -294,14 +287,12 @@ static const struct ni_board_struct ni_boards[] = {
		.ao_speed	= 10000,
		.num_p0_dio_channels = 8,
		.caldac		= { dac8800, dac8043, ad8522 },
	 .has_8255 = 0,
	},
	[BOARD_PCIMIO_16E_1] = {
		.name		= "pci-mio-16e-1",	/* aka pci-6070e */
		.n_adchan	= 16,
		.adbits		= 12,
		.ai_fifo_depth	= 512,
	 .alwaysdither = 0,
		.gainlkup	= ai_gain_16,
		.ai_speed	= 800,
		.n_aochan	= 2,
@@ -312,17 +303,17 @@ static const struct ni_board_struct ni_boards[] = {
		.ao_speed	= 1000,
		.num_p0_dio_channels = 8,
		.caldac		= { mb88341 },
	 .has_8255 = 0,
	},
	[BOARD_PCIMIO_16E_4] = {
		.name		= "pci-mio-16e-4",	/* aka pci-6040e */
		.n_adchan	= 16,
		.adbits		= 12,
		.ai_fifo_depth	= 512,
	 .alwaysdither = 0,
		.gainlkup	= ai_gain_16,
	 /*      .Note = there have been reported problems with full speed
	  * on this board */
		/*
		 * there have been reported problems with
		 * full speed on this board
		 */
		.ai_speed	= 2000,
		.n_aochan	= 2,
		.aobits		= 12,
@@ -332,14 +323,12 @@ static const struct ni_board_struct ni_boards[] = {
		.ao_speed	= 1000,
		.num_p0_dio_channels = 8,
		.caldac		= { ad8804_debug },	/* doc says mb88341 */
	 .has_8255 = 0,
	},
	[BOARD_PXI6040E] = {
		.name		= "pxi-6040e",
		.n_adchan	= 16,
		.adbits		= 12,
		.ai_fifo_depth	= 512,
	 .alwaysdither = 0,
		.gainlkup	= ai_gain_16,
		.ai_speed	= 2000,
		.n_aochan	= 2,
@@ -350,7 +339,6 @@ static const struct ni_board_struct ni_boards[] = {
		.ao_speed	= 1000,
		.num_p0_dio_channels = 8,
		.caldac		= { mb88341 },
	 .has_8255 = 0,
	},
	[BOARD_PCI6031E] = {
		.name		= "pci-6031e",
@@ -368,7 +356,6 @@ static const struct ni_board_struct ni_boards[] = {
		.ao_speed	= 10000,
		.num_p0_dio_channels = 8,
		.caldac		= { dac8800, dac8043, ad8522 },
	 .has_8255 = 0,
	},
	[BOARD_PCI6032E] = {
		.name		= "pci-6032e",
@@ -378,13 +365,8 @@ static const struct ni_board_struct ni_boards[] = {
		.alwaysdither	= 1,
		.gainlkup	= ai_gain_14,
		.ai_speed	= 10000,
	 .n_aochan = 0,
	 .aobits = 0,
	 .ao_fifo_depth = 0,
	 .ao_unipolar = 0,
		.num_p0_dio_channels = 8,
		.caldac		= { dac8800, dac8043, ad8522 },
	 .has_8255 = 0,
	},
	[BOARD_PCI6033E] = {
		.name		= "pci-6033e",
@@ -394,13 +376,8 @@ static const struct ni_board_struct ni_boards[] = {
		.alwaysdither	= 1,
		.gainlkup	= ai_gain_14,
		.ai_speed	= 10000,
	 .n_aochan = 0,
	 .aobits = 0,
	 .ao_fifo_depth = 0,
	 .ao_unipolar = 0,
		.num_p0_dio_channels = 8,
		.caldac		= { dac8800, dac8043, ad8522 },
	 .has_8255 = 0,
	},
	[BOARD_PCI6071E] = {
		.name		= "pci-6071e",
@@ -418,54 +395,41 @@ static const struct ni_board_struct ni_boards[] = {
		.ao_speed	= 1000,
		.num_p0_dio_channels = 8,
		.caldac		= { ad8804_debug },
	 .has_8255 = 0,
	},
	[BOARD_PCI6023E] = {
		.name		= "pci-6023e",
		.n_adchan	= 16,
		.adbits		= 12,
		.ai_fifo_depth	= 512,
	 .alwaysdither = 0,
		.gainlkup	= ai_gain_4,
		.ai_speed	= 5000,
	 .n_aochan = 0,
	 .aobits = 0,
	 .ao_unipolar = 0,
		.num_p0_dio_channels = 8,
		.caldac		= { ad8804_debug },	/* manual is wrong */
	 .has_8255 = 0,
	},
	[BOARD_PCI6024E] = {
		.name		= "pci-6024e",
		.n_adchan	= 16,
		.adbits		= 12,
		.ai_fifo_depth	= 512,
	 .alwaysdither = 0,
		.gainlkup	= ai_gain_4,
		.ai_speed	= 5000,
		.n_aochan	= 2,
		.aobits		= 12,
	 .ao_fifo_depth = 0,
		.ao_range_table	= &range_bipolar10,
	 .ao_unipolar = 0,
		.ao_speed	= 100000,
		.num_p0_dio_channels = 8,
		.caldac		= { ad8804_debug },	/* manual is wrong */
	 .has_8255 = 0,
	},
	[BOARD_PCI6025E] = {
		.name		= "pci-6025e",
		.n_adchan	= 16,
		.adbits		= 12,
		.ai_fifo_depth	= 512,
	 .alwaysdither = 0,
		.gainlkup	= ai_gain_4,
		.ai_speed	= 5000,
		.n_aochan	= 2,
		.aobits		= 12,
	 .ao_fifo_depth = 0,
		.ao_range_table	= &range_bipolar10,
	 .ao_unipolar = 0,
		.ao_speed	= 100000,
		.num_p0_dio_channels = 8,
		.caldac		= { ad8804_debug },	/* manual is wrong */
@@ -476,12 +440,10 @@ static const struct ni_board_struct ni_boards[] = {
		.n_adchan	= 16,
		.adbits		= 12,
		.ai_fifo_depth	= 512,
	 .alwaysdither = 0,
		.gainlkup	= ai_gain_4,
		.ai_speed	= 5000,
		.n_aochan	= 2,
		.aobits		= 12,
	 .ao_fifo_depth = 0,
		.ao_range_table	= &range_ni_E_ao_ext,
		.ao_unipolar	= 1,
		.ao_speed	= 100000,
@@ -497,13 +459,8 @@ static const struct ni_board_struct ni_boards[] = {
		.alwaysdither	= 1,
		.gainlkup	= ai_gain_4,
		.ai_speed	= 5000,
	 .n_aochan = 0,
	 .aobits = 0,
	 .ao_fifo_depth = 0,
	 .ao_unipolar = 0,
		.num_p0_dio_channels = 8,
		.caldac		= { ad8804_debug },
	 .has_8255 = 0,
	},
	[BOARD_PCI6035E] = {
		.name		= "pci-6035e",
@@ -515,13 +472,10 @@ static const struct ni_board_struct ni_boards[] = {
		.ai_speed	= 5000,
		.n_aochan	= 2,
		.aobits		= 12,
	 .ao_fifo_depth = 0,
		.ao_range_table	= &range_bipolar10,
	 .ao_unipolar = 0,
		.ao_speed	= 100000,
		.num_p0_dio_channels = 8,
		.caldac		= { ad8804_debug },
	 .has_8255 = 0,
	},
	[BOARD_PCI6052E] = {
		.name		= "pci-6052e",
@@ -538,7 +492,8 @@ static const struct ni_board_struct ni_boards[] = {
		.ao_range_table	= &range_ni_E_ao_ext,
		.ao_speed	= 3000,
		.num_p0_dio_channels = 8,
	 .caldac = {ad8804_debug, ad8804_debug, ad8522},	/* manual is wrong */
		/* manual is wrong */
		.caldac		= { ad8804_debug, ad8804_debug, ad8522 },
	},
	[BOARD_PCI6110] = {
		.name		= "pci-6110",
@@ -552,7 +507,6 @@ static const struct ni_board_struct ni_boards[] = {
		.aobits		= 16,
		.reg_type	= ni_reg_611x,
		.ao_range_table	= &range_bipolar10,
	 .ao_unipolar = 0,
		.ao_fifo_depth	= 2048,
		.ao_speed	= 250,
		.num_p0_dio_channels = 8,
@@ -563,14 +517,12 @@ static const struct ni_board_struct ni_boards[] = {
		.n_adchan	= 2,
		.adbits		= 12,
		.ai_fifo_depth	= 8192,
	 .alwaysdither = 0,
		.gainlkup	= ai_gain_611x,
		.ai_speed	= 200,
		.n_aochan	= 2,
		.aobits		= 16,
		.reg_type	= ni_reg_611x,
		.ao_range_table	= &range_bipolar10,
	 .ao_unipolar = 0,
		.ao_fifo_depth	= 2048,
		.ao_speed	= 250,
		.num_p0_dio_channels = 8,
@@ -583,18 +535,17 @@ static const struct ni_board_struct ni_boards[] = {
		.n_adchan	= 4,
		.adbits		= 12,
		.ai_fifo_depth	= 8192,
	 .alwaysdither = 0,
		.gainlkup	= ai_gain_611x,
		.ai_speed	= 100,
		.n_aochan	= 2,
		.aobits		= 16,
		.ao_671x	= 1,
	 .ao_unipolar = 0,
		.ao_fifo_depth	= 2048,
		.ao_speed	= 250,
		.num_p0_dio_channels = 8,
		.reg_611x	= 1,
	 .caldac = {ad8804_debug, ad8804_debug, ad8804_debug},	/* XXX */
		/* XXX */
		.caldac		= { ad8804_debug, ad8804_debug, ad8804_debug },
	},
#endif
#if 0
@@ -603,28 +554,25 @@ static const struct ni_board_struct ni_boards[] = {
		.n_adchan	= 4,
		.adbits		= 12,
		.ai_fifo_depth	= 8192,
	 .alwaysdither = 0,
		.gainlkup	= ai_gain_611x,
		.ai_speed	= 100,
		.n_aochan	= 2,
		.aobits		= 16,
		.ao_671x	= 1,
	 .ao_unipolar = 0,
		.ao_fifo_depth	= 2048,
		.ao_speed	= 250,
		.reg_611x	= 1,
		.num_p0_dio_channels = 8,
	 caldac = {ad8804_debug, ad8804_debug, ad8804_debug},	/* XXX */
		/* XXX */
		.caldac		= { ad8804_debug, ad8804_debug, ad8804_debug },
	},
#endif
	[BOARD_PCI6711] = {
		.name = "pci-6711",
	 .n_adchan = 0,		/* no analog input */
		.n_aochan	= 4,
		.aobits		= 12,
	 .ao_unipolar = 0,
	 .ao_fifo_depth = 16384,
		/* data sheet says 8192, but fifo really holds 16384 samples */
		.ao_fifo_depth	= 16384,
		.ao_range_table	= &range_bipolar10,
		.ao_speed	= 1000,
		.num_p0_dio_channels = 8,
@@ -633,10 +581,8 @@ static const struct ni_board_struct ni_boards[] = {
	},
	[BOARD_PXI6711] = {
		.name		= "pxi-6711",
	 .n_adchan = 0,		/* no analog input */
		.n_aochan	= 4,
		.aobits		= 12,
	 .ao_unipolar = 0,
		.ao_fifo_depth	= 16384,
		.ao_range_table	= &range_bipolar10,
		.ao_speed	= 1000,
@@ -646,10 +592,8 @@ static const struct ni_board_struct ni_boards[] = {
	},
	[BOARD_PCI6713] = {
		.name		= "pci-6713",
	 .n_adchan = 0,		/* no analog input */
		.n_aochan	= 8,
		.aobits		= 12,
	 .ao_unipolar = 0,
		.ao_fifo_depth	= 16384,
		.ao_range_table	= &range_bipolar10,
		.ao_speed	= 1000,
@@ -659,10 +603,8 @@ static const struct ni_board_struct ni_boards[] = {
	},
	[BOARD_PXI6713] = {
		.name		= "pxi-6713",
	 .n_adchan = 0,		/* no analog input */
		.n_aochan	= 8,
		.aobits		= 12,
	 .ao_unipolar = 0,
		.ao_fifo_depth	= 16384,
		.ao_range_table	= &range_bipolar10,
		.ao_speed	= 1000,
@@ -672,10 +614,8 @@ static const struct ni_board_struct ni_boards[] = {
	},
	[BOARD_PCI6731] = {
		.name		= "pci-6731",
	 .n_adchan = 0,		/* no analog input */
		.n_aochan	= 4,
		.aobits		= 16,
	 .ao_unipolar = 0,
		.ao_fifo_depth	= 8192,
		.ao_range_table	= &range_bipolar10,
		.ao_speed	= 1000,
@@ -686,10 +626,8 @@ static const struct ni_board_struct ni_boards[] = {
#if 0
	[BOARD_PXI6731] = {	/* .device_id = ????, */
		.name		= "pxi-6731",
	 .n_adchan = 0,		/* no analog input */
		.n_aochan	= 4,
		.aobits		= 16,
	 .ao_unipolar = 0,
		.ao_fifo_depth	= 8192,
		.ao_range_table	= &range_bipolar10,
		.num_p0_dio_channels = 8,
@@ -699,10 +637,8 @@ static const struct ni_board_struct ni_boards[] = {
#endif
	[BOARD_PCI6733] = {
		.name		= "pci-6733",
	 .n_adchan = 0,		/* no analog input */
		.n_aochan	= 8,
		.aobits		= 16,
	 .ao_unipolar = 0,
		.ao_fifo_depth	= 16384,
		.ao_range_table	= &range_bipolar10,
		.ao_speed	= 1000,
@@ -712,10 +648,8 @@ static const struct ni_board_struct ni_boards[] = {
	},
	[BOARD_PXI6733] = {
		.name		= "pxi-6733",
	 .n_adchan = 0,		/* no analog input */
		.n_aochan	= 8,
		.aobits		= 16,
	 .ao_unipolar = 0,
		.ao_fifo_depth	= 16384,
		.ao_range_table	= &range_bipolar10,
		.ao_speed	= 1000,
@@ -739,7 +673,6 @@ static const struct ni_board_struct ni_boards[] = {
		.ao_speed	= 1000,
		.num_p0_dio_channels = 8,
		.caldac		= { ad8804_debug },
	 .has_8255 = 0,
	},
	[BOARD_PXI6070E] = {
		.name		= "pxi-6070e",
@@ -757,7 +690,6 @@ static const struct ni_board_struct ni_boards[] = {
		.ao_speed	= 1000,
		.num_p0_dio_channels = 8,
		.caldac		= { ad8804_debug },
	 .has_8255 = 0,
	},
	[BOARD_PXI6052E] = {
		.name		= "pxi-6052e",
@@ -803,30 +735,21 @@ static const struct ni_board_struct ni_boards[] = {
		.ai_speed	= 5000,
		.n_aochan	= 2,
		.aobits		= 16,
	 .ao_fifo_depth = 0,
		.ao_range_table	= &range_bipolar10,
	 .ao_unipolar = 0,
		.ao_speed	= 100000,
		.num_p0_dio_channels = 8,
		.caldac		= { ad8804_debug },
	 .has_8255 = 0,
	},
	[BOARD_PCI6220] = {
		.name		= "pci-6220",
		.n_adchan	= 16,
		.adbits		= 16,
	 .ai_fifo_depth = 512,
	 /*      .FIXME = guess */
		.ai_fifo_depth	= 512,		/* FIXME: guess */
		.gainlkup	= ai_gain_622x,
		.ai_speed	= 4000,
	 .n_aochan = 0,
	 .aobits = 0,
	 .ao_fifo_depth = 0,
		.num_p0_dio_channels = 8,
		.reg_type	= ni_reg_622x,
	 .ao_unipolar = 0,
		.caldac		= { caldac_none },
	 .has_8255 = 0,
	},
	[BOARD_PCI6221] = {
		.name		= "pci-6221",
@@ -840,11 +763,9 @@ static const struct ni_board_struct ni_boards[] = {
		.ao_fifo_depth	= 8191,
		.ao_range_table	= &range_ni_M_622x_ao,
		.reg_type	= ni_reg_622x,
	 .ao_unipolar = 0,
		.ao_speed	= 1200,
		.num_p0_dio_channels = 8,
		.caldac		= { caldac_none },
	 .has_8255 = 0,
	},
	[BOARD_PCI6221_37PIN] = {
		.name		= "pci-6221_37pin",
@@ -858,11 +779,9 @@ static const struct ni_board_struct ni_boards[] = {
		.ao_fifo_depth	= 8191,
		.ao_range_table	= &range_ni_M_622x_ao,
		.reg_type	= ni_reg_622x,
	 .ao_unipolar = 0,
		.ao_speed	= 1200,
		.num_p0_dio_channels = 8,
		.caldac		= { caldac_none },
	 .has_8255 = 0,
	},
	[BOARD_PCI6224] = {
		.name		= "pci-6224",
@@ -871,14 +790,9 @@ static const struct ni_board_struct ni_boards[] = {
		.ai_fifo_depth	= 4095,
		.gainlkup	= ai_gain_622x,
		.ai_speed	= 4000,
	 .n_aochan = 0,
	 .aobits = 0,
	 .ao_fifo_depth = 0,
		.reg_type	= ni_reg_622x,
	 .ao_unipolar = 0,
		.num_p0_dio_channels = 32,
		.caldac		= { caldac_none },
	 .has_8255 = 0,
	},
	[BOARD_PXI6224] = {
		.name		= "pxi-6224",
@@ -887,14 +801,9 @@ static const struct ni_board_struct ni_boards[] = {
		.ai_fifo_depth	= 4095,
		.gainlkup	= ai_gain_622x,
		.ai_speed	= 4000,
	 .n_aochan = 0,
	 .aobits = 0,
	 .ao_fifo_depth = 0,
		.reg_type	= ni_reg_622x,
	 .ao_unipolar = 0,
		.num_p0_dio_channels = 32,
		.caldac		= { caldac_none },
	 .has_8255 = 0,
	},
	[BOARD_PCI6225] = {
		.name		= "pci-6225",
@@ -908,11 +817,9 @@ static const struct ni_board_struct ni_boards[] = {
		.ao_fifo_depth	= 8191,
		.ao_range_table	= &range_ni_M_622x_ao,
		.reg_type	= ni_reg_622x,
	 .ao_unipolar = 0,
		.ao_speed	= 1200,
		.num_p0_dio_channels = 32,
		.caldac		= { caldac_none },
	 .has_8255 = 0,
	},
	[BOARD_PXI6225] = {
		.name		= "pxi-6225",
@@ -926,11 +833,9 @@ static const struct ni_board_struct ni_boards[] = {
		.ao_fifo_depth	= 8191,
		.ao_range_table	= &range_ni_M_622x_ao,
		.reg_type	= ni_reg_622x,
	 .ao_unipolar = 0,
		.ao_speed	= 1200,
		.num_p0_dio_channels = 32,
		.caldac		= { caldac_none },
	 .has_8255 = 0,
	},
	[BOARD_PCI6229] = {
		.name		= "pci-6229",
@@ -944,11 +849,9 @@ static const struct ni_board_struct ni_boards[] = {
		.ao_fifo_depth	= 8191,
		.ao_range_table	= &range_ni_M_622x_ao,
		.reg_type	= ni_reg_622x,
	 .ao_unipolar = 0,
		.ao_speed	= 1200,
		.num_p0_dio_channels = 32,
		.caldac		= { caldac_none },
	 .has_8255 = 0,
	},
	[BOARD_PCI6250] = {
		.name		= "pci-6250",
@@ -957,14 +860,9 @@ static const struct ni_board_struct ni_boards[] = {
		.ai_fifo_depth	= 4095,
		.gainlkup	= ai_gain_628x,
		.ai_speed	= 800,
	 .n_aochan = 0,
	 .aobits = 0,
	 .ao_fifo_depth = 0,
		.reg_type	= ni_reg_625x,
	 .ao_unipolar = 0,
		.num_p0_dio_channels = 8,
		.caldac		= { caldac_none },
	 .has_8255 = 0,
	},
	[BOARD_PCI6251] = {
		.name		= "pci-6251",
@@ -978,11 +876,9 @@ static const struct ni_board_struct ni_boards[] = {
		.ao_fifo_depth	= 8191,
		.ao_range_table	= &range_ni_M_625x_ao,
		.reg_type	= ni_reg_625x,
	 .ao_unipolar = 0,
		.ao_speed	= 350,
		.num_p0_dio_channels = 8,
		.caldac		= { caldac_none },
	 .has_8255 = 0,
	},
	[BOARD_PCIE6251] = {
		.name		= "pcie-6251",
@@ -996,11 +892,9 @@ static const struct ni_board_struct ni_boards[] = {
		.ao_fifo_depth	= 8191,
		.ao_range_table	= &range_ni_M_625x_ao,
		.reg_type	= ni_reg_625x,
	 .ao_unipolar = 0,
		.ao_speed	= 350,
		.num_p0_dio_channels = 8,
		.caldac		= { caldac_none },
	 .has_8255 = 0,
	},
	[BOARD_PXIE6251] = {
		.name		= "pxie-6251",
@@ -1014,11 +908,9 @@ static const struct ni_board_struct ni_boards[] = {
		.ao_fifo_depth	= 8191,
		.ao_range_table	= &range_ni_M_625x_ao,
		.reg_type	= ni_reg_625x,
	 .ao_unipolar = 0,
		.ao_speed	= 350,
		.num_p0_dio_channels = 8,
		.caldac		= { caldac_none },
	 .has_8255 = 0,
	},
	[BOARD_PCI6254] = {
		.name		= "pci-6254",
@@ -1027,14 +919,9 @@ static const struct ni_board_struct ni_boards[] = {
		.ai_fifo_depth	= 4095,
		.gainlkup	= ai_gain_628x,
		.ai_speed	= 800,
	 .n_aochan = 0,
	 .aobits = 0,
	 .ao_fifo_depth = 0,
		.reg_type	= ni_reg_625x,
	 .ao_unipolar = 0,
		.num_p0_dio_channels = 32,
		.caldac		= { caldac_none },
	 .has_8255 = 0,
	},
	[BOARD_PCI6259] = {
		.name		= "pci-6259",
@@ -1048,11 +935,9 @@ static const struct ni_board_struct ni_boards[] = {
		.ao_fifo_depth	= 8191,
		.ao_range_table	= &range_ni_M_625x_ao,
		.reg_type	= ni_reg_625x,
	 .ao_unipolar = 0,
		.ao_speed	= 350,
		.num_p0_dio_channels = 32,
		.caldac		= { caldac_none },
	 .has_8255 = 0,
	},
	[BOARD_PCIE6259] = {
		.name		= "pcie-6259",
@@ -1066,11 +951,9 @@ static const struct ni_board_struct ni_boards[] = {
		.ao_fifo_depth	= 8191,
		.ao_range_table	= &range_ni_M_625x_ao,
		.reg_type	= ni_reg_625x,
	 .ao_unipolar = 0,
		.ao_speed	= 350,
		.num_p0_dio_channels = 32,
		.caldac		= { caldac_none },
	 .has_8255 = 0,
	},
	[BOARD_PCI6280] = {
		.name		= "pci-6280",
@@ -1079,14 +962,10 @@ static const struct ni_board_struct ni_boards[] = {
		.ai_fifo_depth	= 2047,
		.gainlkup	= ai_gain_628x,
		.ai_speed	= 1600,
	 .n_aochan = 0,
	 .aobits = 0,
		.ao_fifo_depth	= 8191,
		.reg_type	= ni_reg_628x,
	 .ao_unipolar = 0,
		.num_p0_dio_channels = 8,
		.caldac		= { caldac_none },
	 .has_8255 = 0,
	},
	[BOARD_PCI6281] = {
		.name		= "pci-6281",
@@ -1104,7 +983,6 @@ static const struct ni_board_struct ni_boards[] = {
		.ao_speed	= 350,
		.num_p0_dio_channels = 8,
		.caldac		= { caldac_none },
	 .has_8255 = 0,
	},
	[BOARD_PXI6281] = {
		.name		= "pxi-6281",
@@ -1122,7 +1000,6 @@ static const struct ni_board_struct ni_boards[] = {
		.ao_speed	= 350,
		.num_p0_dio_channels = 8,
		.caldac		= { caldac_none },
	 .has_8255 = 0,
	},
	[BOARD_PCI6284] = {
		.name		= "pci-6284",
@@ -1131,14 +1008,9 @@ static const struct ni_board_struct ni_boards[] = {
		.ai_fifo_depth	= 2047,
		.gainlkup	= ai_gain_628x,
		.ai_speed	= 1600,
	 .n_aochan = 0,
	 .aobits = 0,
	 .ao_fifo_depth = 0,
		.reg_type	= ni_reg_628x,
	 .ao_unipolar = 0,
		.num_p0_dio_channels = 32,
		.caldac		= { caldac_none },
	 .has_8255 = 0,
	},
	[BOARD_PCI6289] = {
		.name		= "pci-6289",
@@ -1156,21 +1028,15 @@ static const struct ni_board_struct ni_boards[] = {
		.ao_speed	= 350,
		.num_p0_dio_channels = 32,
		.caldac		= { caldac_none },
	 .has_8255 = 0,
	},
	[BOARD_PCI6143] = {
		.name		= "pci-6143",
		.n_adchan	= 8,
		.adbits		= 16,
		.ai_fifo_depth	= 1024,
	 .alwaysdither = 0,
		.gainlkup	= ai_gain_6143,
		.ai_speed	= 4000,
	 .n_aochan = 0,
	 .aobits = 0,
		.reg_type	= ni_reg_6143,
	 .ao_unipolar = 0,
	 .ao_fifo_depth = 0,
		.num_p0_dio_channels = 8,
		.caldac		= { ad8804_debug, ad8804_debug },
	},
@@ -1179,14 +1045,9 @@ static const struct ni_board_struct ni_boards[] = {
		.n_adchan	= 8,
		.adbits		= 16,
		.ai_fifo_depth	= 1024,
	 .alwaysdither = 0,
		.gainlkup	= ai_gain_6143,
		.ai_speed	= 4000,
	 .n_aochan = 0,
	 .aobits = 0,
		.reg_type	= ni_reg_6143,
	 .ao_unipolar = 0,
	 .ao_fifo_depth = 0,
		.num_p0_dio_channels = 8,
		.caldac		= { ad8804_debug, ad8804_debug },
	},