staging: comedi: ni_pcimio: cleanup the boardinfo

For aesthetic reasons, add some whitespace to the boardinfo.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/comedi/drivers/ni_pcimio.c b/drivers/staging/comedi/drivers/ni_pcimio.c
index 4bcf8eaa55c991858652b602b4a2ebd0c5e8c3ef..c8e0127783c77e5e254c97ce7c0e9c36b5c4bb18 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_pcimio.c
+++ b/drivers/staging/comedi/drivers/ni_pcimio.c
@@ -225,971 +225,832 @@ enum ni_pcimio_boardid {
 
 static const struct ni_board_struct ni_boards[] = {
        [BOARD_PCIMIO_16XE_50] = {
-        .name = "pci-mio-16xe-50",
-        .n_adchan = 16,
-        .adbits = 16,
-        .ai_fifo_depth = 2048,
-        .alwaysdither = 1,
-        .gainlkup = ai_gain_8,
-        .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,
-        },
+               .name           = "pci-mio-16xe-50",
+               .n_adchan       = 16,
+               .adbits         = 16,
+               .ai_fifo_depth  = 2048,
+               .alwaysdither   = 1,
+               .gainlkup       = ai_gain_8,
+               .ai_speed       = 50000,
+               .n_aochan       = 2,
+               .aobits         = 12,
+               .ao_range_table = &range_bipolar10,
+               .ao_speed       = 50000,
+               .num_p0_dio_channels = 8,
+               .caldac         = { dac8800, dac8043 },
+       },
        [BOARD_PCIMIO_16XE_10] = {
-        .name = "pci-mio-16xe-10",     /*  aka pci-6030E */
-        .n_adchan = 16,
-        .adbits = 16,
-        .ai_fifo_depth = 512,
-        .alwaysdither = 1,
-        .gainlkup = ai_gain_14,
-        .ai_speed = 10000,
-        .n_aochan = 2,
-        .aobits = 16,
-        .ao_fifo_depth = 2048,
-        .ao_range_table = &range_ni_E_ao_ext,
-        .ao_unipolar = 1,
-        .ao_speed = 10000,
-        .num_p0_dio_channels = 8,
-        .caldac = {dac8800, dac8043, ad8522},
-        .has_8255 = 0,
-        },
+               .name           = "pci-mio-16xe-10",    /*  aka pci-6030E */
+               .n_adchan       = 16,
+               .adbits         = 16,
+               .ai_fifo_depth  = 512,
+               .alwaysdither   = 1,
+               .gainlkup       = ai_gain_14,
+               .ai_speed       = 10000,
+               .n_aochan       = 2,
+               .aobits         = 16,
+               .ao_fifo_depth  = 2048,
+               .ao_range_table = &range_ni_E_ao_ext,
+               .ao_unipolar    = 1,
+               .ao_speed       = 10000,
+               .num_p0_dio_channels = 8,
+               .caldac         = { dac8800, dac8043, ad8522 },
+       },
        [BOARD_PCI6014] = {
-        .name = "pci-6014",
-        .n_adchan = 16,
-        .adbits = 16,
-        .ai_fifo_depth = 512,
-        .alwaysdither = 1,
-        .gainlkup = ai_gain_4,
-        .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,
-        },
+               .name           = "pci-6014",
+               .n_adchan       = 16,
+               .adbits         = 16,
+               .ai_fifo_depth  = 512,
+               .alwaysdither   = 1,
+               .gainlkup       = ai_gain_4,
+               .ai_speed       = 5000,
+               .n_aochan       = 2,
+               .aobits         = 16,
+               .ao_range_table = &range_bipolar10,
+               .ao_speed       = 100000,
+               .num_p0_dio_channels = 8,
+               .caldac         = { ad8804_debug },
+       },
        [BOARD_PXI6030E] = {
-        .name = "pxi-6030e",
-        .n_adchan = 16,
-        .adbits = 16,
-        .ai_fifo_depth = 512,
-        .alwaysdither = 1,
-        .gainlkup = ai_gain_14,
-        .ai_speed = 10000,
-        .n_aochan = 2,
-        .aobits = 16,
-        .ao_fifo_depth = 2048,
-        .ao_range_table = &range_ni_E_ao_ext,
-        .ao_unipolar = 1,
-        .ao_speed = 10000,
-        .num_p0_dio_channels = 8,
-        .caldac = {dac8800, dac8043, ad8522},
-        .has_8255 = 0,
-        },
+               .name           = "pxi-6030e",
+               .n_adchan       = 16,
+               .adbits         = 16,
+               .ai_fifo_depth  = 512,
+               .alwaysdither   = 1,
+               .gainlkup       = ai_gain_14,
+               .ai_speed       = 10000,
+               .n_aochan       = 2,
+               .aobits         = 16,
+               .ao_fifo_depth  = 2048,
+               .ao_range_table = &range_ni_E_ao_ext,
+               .ao_unipolar    = 1,
+               .ao_speed       = 10000,
+               .num_p0_dio_channels = 8,
+               .caldac         = { dac8800, dac8043, ad8522 },
+       },
        [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,
-        .aobits = 12,
-        .ao_fifo_depth = 2048,
-        .ao_range_table = &range_ni_E_ao_ext,
-        .ao_unipolar = 1,
-        .ao_speed = 1000,
-        .num_p0_dio_channels = 8,
-        .caldac = {mb88341},
-        .has_8255 = 0,
-        },
+               .name           = "pci-mio-16e-1",      /* aka pci-6070e */
+               .n_adchan       = 16,
+               .adbits         = 12,
+               .ai_fifo_depth  = 512,
+               .gainlkup       = ai_gain_16,
+               .ai_speed       = 800,
+               .n_aochan       = 2,
+               .aobits         = 12,
+               .ao_fifo_depth  = 2048,
+               .ao_range_table = &range_ni_E_ao_ext,
+               .ao_unipolar    = 1,
+               .ao_speed       = 1000,
+               .num_p0_dio_channels = 8,
+               .caldac         = { mb88341 },
+       },
        [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 */
-        .ai_speed = 2000,
-        .n_aochan = 2,
-        .aobits = 12,
-        .ao_fifo_depth = 512,
-        .ao_range_table = &range_ni_E_ao_ext,
-        .ao_unipolar = 1,
-        .ao_speed = 1000,
-        .num_p0_dio_channels = 8,
-        .caldac = {ad8804_debug},      /*  doc says mb88341 */
-        .has_8255 = 0,
-        },
+               .name           = "pci-mio-16e-4",      /* aka pci-6040e */
+               .n_adchan       = 16,
+               .adbits         = 12,
+               .ai_fifo_depth  = 512,
+               .gainlkup       = ai_gain_16,
+               /*
+                * there have been reported problems with
+                * full speed on this board
+                */
+               .ai_speed       = 2000,
+               .n_aochan       = 2,
+               .aobits         = 12,
+               .ao_fifo_depth  = 512,
+               .ao_range_table = &range_ni_E_ao_ext,
+               .ao_unipolar    = 1,
+               .ao_speed       = 1000,
+               .num_p0_dio_channels = 8,
+               .caldac         = { ad8804_debug },     /* doc says mb88341 */
+       },
        [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,
-        .aobits = 12,
-        .ao_fifo_depth = 512,
-        .ao_range_table = &range_ni_E_ao_ext,
-        .ao_unipolar = 1,
-        .ao_speed = 1000,
-        .num_p0_dio_channels = 8,
-        .caldac = {mb88341},
-        .has_8255 = 0,
-        },
+               .name           = "pxi-6040e",
+               .n_adchan       = 16,
+               .adbits         = 12,
+               .ai_fifo_depth  = 512,
+               .gainlkup       = ai_gain_16,
+               .ai_speed       = 2000,
+               .n_aochan       = 2,
+               .aobits         = 12,
+               .ao_fifo_depth  = 512,
+               .ao_range_table = &range_ni_E_ao_ext,
+               .ao_unipolar    = 1,
+               .ao_speed       = 1000,
+               .num_p0_dio_channels = 8,
+               .caldac         = { mb88341 },
+       },
        [BOARD_PCI6031E] = {
-        .name = "pci-6031e",
-        .n_adchan = 64,
-        .adbits = 16,
-        .ai_fifo_depth = 512,
-        .alwaysdither = 1,
-        .gainlkup = ai_gain_14,
-        .ai_speed = 10000,
-        .n_aochan = 2,
-        .aobits = 16,
-        .ao_fifo_depth = 2048,
-        .ao_range_table = &range_ni_E_ao_ext,
-        .ao_unipolar = 1,
-        .ao_speed = 10000,
-        .num_p0_dio_channels = 8,
-        .caldac = {dac8800, dac8043, ad8522},
-        .has_8255 = 0,
-        },
+               .name           = "pci-6031e",
+               .n_adchan       = 64,
+               .adbits         = 16,
+               .ai_fifo_depth  = 512,
+               .alwaysdither   = 1,
+               .gainlkup       = ai_gain_14,
+               .ai_speed       = 10000,
+               .n_aochan       = 2,
+               .aobits         = 16,
+               .ao_fifo_depth  = 2048,
+               .ao_range_table = &range_ni_E_ao_ext,
+               .ao_unipolar    = 1,
+               .ao_speed       = 10000,
+               .num_p0_dio_channels = 8,
+               .caldac         = { dac8800, dac8043, ad8522 },
+       },
        [BOARD_PCI6032E] = {
-        .name = "pci-6032e",
-        .n_adchan = 16,
-        .adbits = 16,
-        .ai_fifo_depth = 512,
-        .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,
-        },
+               .name           = "pci-6032e",
+               .n_adchan       = 16,
+               .adbits         = 16,
+               .ai_fifo_depth  = 512,
+               .alwaysdither   = 1,
+               .gainlkup       = ai_gain_14,
+               .ai_speed       = 10000,
+               .num_p0_dio_channels = 8,
+               .caldac         = { dac8800, dac8043, ad8522 },
+       },
        [BOARD_PCI6033E] = {
-        .name = "pci-6033e",
-        .n_adchan = 64,
-        .adbits = 16,
-        .ai_fifo_depth = 512,
-        .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,
-        },
+               .name           = "pci-6033e",
+               .n_adchan       = 64,
+               .adbits         = 16,
+               .ai_fifo_depth  = 512,
+               .alwaysdither   = 1,
+               .gainlkup       = ai_gain_14,
+               .ai_speed       = 10000,
+               .num_p0_dio_channels = 8,
+               .caldac         = { dac8800, dac8043, ad8522 },
+       },
        [BOARD_PCI6071E] = {
-        .name = "pci-6071e",
-        .n_adchan = 64,
-        .adbits = 12,
-        .ai_fifo_depth = 512,
-        .alwaysdither = 1,
-        .gainlkup = ai_gain_16,
-        .ai_speed = 800,
-        .n_aochan = 2,
-        .aobits = 12,
-        .ao_fifo_depth = 2048,
-        .ao_range_table = &range_ni_E_ao_ext,
-        .ao_unipolar = 1,
-        .ao_speed = 1000,
-        .num_p0_dio_channels = 8,
-        .caldac = {ad8804_debug},
-        .has_8255 = 0,
-        },
+               .name           = "pci-6071e",
+               .n_adchan       = 64,
+               .adbits         = 12,
+               .ai_fifo_depth  = 512,
+               .alwaysdither   = 1,
+               .gainlkup       = ai_gain_16,
+               .ai_speed       = 800,
+               .n_aochan       = 2,
+               .aobits         = 12,
+               .ao_fifo_depth  = 2048,
+               .ao_range_table = &range_ni_E_ao_ext,
+               .ao_unipolar    = 1,
+               .ao_speed       = 1000,
+               .num_p0_dio_channels = 8,
+               .caldac         = { ad8804_debug },
+       },
        [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,
-        },
+               .name           = "pci-6023e",
+               .n_adchan       = 16,
+               .adbits         = 12,
+               .ai_fifo_depth  = 512,
+               .gainlkup       = ai_gain_4,
+               .ai_speed       = 5000,
+               .num_p0_dio_channels = 8,
+               .caldac         = { ad8804_debug },     /* manual is wrong */
+       },
        [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,
-        },
+               .name           = "pci-6024e",
+               .n_adchan       = 16,
+               .adbits         = 12,
+               .ai_fifo_depth  = 512,
+               .gainlkup       = ai_gain_4,
+               .ai_speed       = 5000,
+               .n_aochan       = 2,
+               .aobits         = 12,
+               .ao_range_table = &range_bipolar10,
+               .ao_speed       = 100000,
+               .num_p0_dio_channels = 8,
+               .caldac         = { ad8804_debug },     /* manual is wrong */
+       },
        [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 */
-        .has_8255 = 1,
-        },
+               .name           = "pci-6025e",
+               .n_adchan       = 16,
+               .adbits         = 12,
+               .ai_fifo_depth  = 512,
+               .gainlkup       = ai_gain_4,
+               .ai_speed       = 5000,
+               .n_aochan       = 2,
+               .aobits         = 12,
+               .ao_range_table = &range_bipolar10,
+               .ao_speed       = 100000,
+               .num_p0_dio_channels = 8,
+               .caldac         = { ad8804_debug },     /* manual is wrong */
+               .has_8255       = 1,
+       },
        [BOARD_PXI6025E] = {
-        .name = "pxi-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_ni_E_ao_ext,
-        .ao_unipolar = 1,
-        .ao_speed = 100000,
-        .num_p0_dio_channels = 8,
-        .caldac = {ad8804_debug},      /* manual is wrong */
-        .has_8255 = 1,
-        },
+               .name           = "pxi-6025e",
+               .n_adchan       = 16,
+               .adbits         = 12,
+               .ai_fifo_depth  = 512,
+               .gainlkup       = ai_gain_4,
+               .ai_speed       = 5000,
+               .n_aochan       = 2,
+               .aobits         = 12,
+               .ao_range_table = &range_ni_E_ao_ext,
+               .ao_unipolar    = 1,
+               .ao_speed       = 100000,
+               .num_p0_dio_channels = 8,
+               .caldac         = { ad8804_debug },     /* manual is wrong */
+               .has_8255       = 1,
+       },
        [BOARD_PCI6034E] = {
-        .name = "pci-6034e",
-        .n_adchan = 16,
-        .adbits = 16,
-        .ai_fifo_depth = 512,
-        .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,
-        },
+               .name           = "pci-6034e",
+               .n_adchan       = 16,
+               .adbits         = 16,
+               .ai_fifo_depth  = 512,
+               .alwaysdither   = 1,
+               .gainlkup       = ai_gain_4,
+               .ai_speed       = 5000,
+               .num_p0_dio_channels = 8,
+               .caldac         = { ad8804_debug },
+       },
        [BOARD_PCI6035E] = {
-        .name = "pci-6035e",
-        .n_adchan = 16,
-        .adbits = 16,
-        .ai_fifo_depth = 512,
-        .alwaysdither = 1,
-        .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},
-        .has_8255 = 0,
-        },
+               .name           = "pci-6035e",
+               .n_adchan       = 16,
+               .adbits         = 16,
+               .ai_fifo_depth  = 512,
+               .alwaysdither   = 1,
+               .gainlkup       = ai_gain_4,
+               .ai_speed       = 5000,
+               .n_aochan       = 2,
+               .aobits         = 12,
+               .ao_range_table = &range_bipolar10,
+               .ao_speed       = 100000,
+               .num_p0_dio_channels = 8,
+               .caldac         = { ad8804_debug },
+       },
        [BOARD_PCI6052E] = {
-        .name = "pci-6052e",
-        .n_adchan = 16,
-        .adbits = 16,
-        .ai_fifo_depth = 512,
-        .alwaysdither = 1,
-        .gainlkup = ai_gain_16,
-        .ai_speed = 3000,
-        .n_aochan = 2,
-        .aobits = 16,
-        .ao_unipolar = 1,
-        .ao_fifo_depth = 2048,
-        .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 */
-        },
+               .name           = "pci-6052e",
+               .n_adchan       = 16,
+               .adbits         = 16,
+               .ai_fifo_depth  = 512,
+               .alwaysdither   = 1,
+               .gainlkup       = ai_gain_16,
+               .ai_speed       = 3000,
+               .n_aochan       = 2,
+               .aobits         = 16,
+               .ao_unipolar    = 1,
+               .ao_fifo_depth  = 2048,
+               .ao_range_table = &range_ni_E_ao_ext,
+               .ao_speed       = 3000,
+               .num_p0_dio_channels = 8,
+               /* manual is wrong */
+               .caldac         = { ad8804_debug, ad8804_debug, ad8522 },
+       },
        [BOARD_PCI6110] = {
-        .name = "pci-6110",
-        .n_adchan = 4,
-        .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,
-        .caldac = {ad8804, ad8804},
-        },
+               .name           = "pci-6110",
+               .n_adchan       = 4,
+               .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_fifo_depth  = 2048,
+               .ao_speed       = 250,
+               .num_p0_dio_channels = 8,
+               .caldac         = { ad8804, ad8804 },
+       },
        [BOARD_PCI6111] = {
-        .name = "pci-6111",
-        .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,
-        .caldac = {ad8804, ad8804},
-        },
+               .name           = "pci-6111",
+               .n_adchan       = 2,
+               .adbits         = 12,
+               .ai_fifo_depth  = 8192,
+               .gainlkup       = ai_gain_611x,
+               .ai_speed       = 200,
+               .n_aochan       = 2,
+               .aobits         = 16,
+               .reg_type       = ni_reg_611x,
+               .ao_range_table = &range_bipolar10,
+               .ao_fifo_depth  = 2048,
+               .ao_speed       = 250,
+               .num_p0_dio_channels = 8,
+               .caldac         = { ad8804, ad8804 },
+       },
 #if 0
        /* The 6115 boards probably need their own driver */
        [BOARD_PCI6115] = {     /* .device_id = 0x2ed0, */
-        .name = "pci-6115",
-        .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 */
-        },
+               .name           = "pci-6115",
+               .n_adchan       = 4,
+               .adbits         = 12,
+               .ai_fifo_depth  = 8192,
+               .gainlkup       = ai_gain_611x,
+               .ai_speed       = 100,
+               .n_aochan       = 2,
+               .aobits         = 16,
+               .ao_671x        = 1,
+               .ao_fifo_depth  = 2048,
+               .ao_speed       = 250,
+               .num_p0_dio_channels = 8,
+               .reg_611x       = 1,
+               /* XXX */
+               .caldac         = { ad8804_debug, ad8804_debug, ad8804_debug },
+       },
 #endif
 #if 0
        [BOARD_PXI6115] = {     /* .device_id = ????, */
-        .name = "pxi-6115",
-        .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 */
-        },
+               .name           = "pxi-6115",
+               .n_adchan       = 4,
+               .adbits         = 12,
+               .ai_fifo_depth  = 8192,
+               .gainlkup       = ai_gain_611x,
+               .ai_speed       = 100,
+               .n_aochan       = 2,
+               .aobits         = 16,
+               .ao_671x        = 1,
+               .ao_fifo_depth  = 2048,
+               .ao_speed       = 250,
+               .reg_611x       = 1,
+               .num_p0_dio_channels = 8,
+               /* 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_range_table = &range_bipolar10,
-        .ao_speed = 1000,
-        .num_p0_dio_channels = 8,
-        .reg_type = ni_reg_6711,
-        .caldac = {ad8804_debug},
-        },
+               .name = "pci-6711",
+               .n_aochan       = 4,
+               .aobits         = 12,
+               /* 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,
+               .reg_type       = ni_reg_6711,
+               .caldac         = { ad8804_debug },
+       },
        [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,
-        .num_p0_dio_channels = 8,
-        .reg_type = ni_reg_6711,
-        .caldac = {ad8804_debug},
-        },
+               .name           = "pxi-6711",
+               .n_aochan       = 4,
+               .aobits         = 12,
+               .ao_fifo_depth  = 16384,
+               .ao_range_table = &range_bipolar10,
+               .ao_speed       = 1000,
+               .num_p0_dio_channels = 8,
+               .reg_type       = ni_reg_6711,
+               .caldac         = { ad8804_debug },
+       },
        [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,
-        .num_p0_dio_channels = 8,
-        .reg_type = ni_reg_6713,
-        .caldac = {ad8804_debug, ad8804_debug},
-        },
+               .name           = "pci-6713",
+               .n_aochan       = 8,
+               .aobits         = 12,
+               .ao_fifo_depth  = 16384,
+               .ao_range_table = &range_bipolar10,
+               .ao_speed       = 1000,
+               .num_p0_dio_channels = 8,
+               .reg_type       = ni_reg_6713,
+               .caldac         = { ad8804_debug, ad8804_debug },
+       },
        [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,
-        .num_p0_dio_channels = 8,
-        .reg_type = ni_reg_6713,
-        .caldac = {ad8804_debug, ad8804_debug},
-        },
+               .name           = "pxi-6713",
+               .n_aochan       = 8,
+               .aobits         = 12,
+               .ao_fifo_depth  = 16384,
+               .ao_range_table = &range_bipolar10,
+               .ao_speed       = 1000,
+               .num_p0_dio_channels = 8,
+               .reg_type       = ni_reg_6713,
+               .caldac         = { ad8804_debug, ad8804_debug },
+       },
        [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,
-        .num_p0_dio_channels = 8,
-        .reg_type = ni_reg_6711,
-        .caldac = {ad8804_debug},
-        },
+               .name           = "pci-6731",
+               .n_aochan       = 4,
+               .aobits         = 16,
+               .ao_fifo_depth  = 8192,
+               .ao_range_table = &range_bipolar10,
+               .ao_speed       = 1000,
+               .num_p0_dio_channels = 8,
+               .reg_type       = ni_reg_6711,
+               .caldac         = { ad8804_debug },
+       },
 #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,
-        .reg_type = ni_reg_6711,
-        .caldac = {ad8804_debug},
-        },
+               .name           = "pxi-6731",
+               .n_aochan       = 4,
+               .aobits         = 16,
+               .ao_fifo_depth  = 8192,
+               .ao_range_table = &range_bipolar10,
+               .num_p0_dio_channels = 8,
+               .reg_type       = ni_reg_6711,
+               .caldac         = { ad8804_debug },
+       },
 #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,
-        .num_p0_dio_channels = 8,
-        .reg_type = ni_reg_6713,
-        .caldac = {ad8804_debug, ad8804_debug},
-        },
+               .name           = "pci-6733",
+               .n_aochan       = 8,
+               .aobits         = 16,
+               .ao_fifo_depth  = 16384,
+               .ao_range_table = &range_bipolar10,
+               .ao_speed       = 1000,
+               .num_p0_dio_channels = 8,
+               .reg_type       = ni_reg_6713,
+               .caldac         = { ad8804_debug, ad8804_debug },
+       },
        [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,
-        .num_p0_dio_channels = 8,
-        .reg_type = ni_reg_6713,
-        .caldac = {ad8804_debug, ad8804_debug},
-        },
+               .name           = "pxi-6733",
+               .n_aochan       = 8,
+               .aobits         = 16,
+               .ao_fifo_depth  = 16384,
+               .ao_range_table = &range_bipolar10,
+               .ao_speed       = 1000,
+               .num_p0_dio_channels = 8,
+               .reg_type       = ni_reg_6713,
+               .caldac         = { ad8804_debug, ad8804_debug },
+       },
        [BOARD_PXI6071E] = {
-        .name = "pxi-6071e",
-        .n_adchan = 64,
-        .adbits = 12,
-        .ai_fifo_depth = 512,
-        .alwaysdither = 1,
-        .gainlkup = ai_gain_16,
-        .ai_speed = 800,
-        .n_aochan = 2,
-        .aobits = 12,
-        .ao_fifo_depth = 2048,
-        .ao_range_table = &range_ni_E_ao_ext,
-        .ao_unipolar = 1,
-        .ao_speed = 1000,
-        .num_p0_dio_channels = 8,
-        .caldac = {ad8804_debug},
-        .has_8255 = 0,
-        },
+               .name           = "pxi-6071e",
+               .n_adchan       = 64,
+               .adbits         = 12,
+               .ai_fifo_depth  = 512,
+               .alwaysdither   = 1,
+               .gainlkup       = ai_gain_16,
+               .ai_speed       = 800,
+               .n_aochan       = 2,
+               .aobits         = 12,
+               .ao_fifo_depth  = 2048,
+               .ao_range_table = &range_ni_E_ao_ext,
+               .ao_unipolar    = 1,
+               .ao_speed       = 1000,
+               .num_p0_dio_channels = 8,
+               .caldac         = { ad8804_debug },
+       },
        [BOARD_PXI6070E] = {
-        .name = "pxi-6070e",
-        .n_adchan = 16,
-        .adbits = 12,
-        .ai_fifo_depth = 512,
-        .alwaysdither = 1,
-        .gainlkup = ai_gain_16,
-        .ai_speed = 800,
-        .n_aochan = 2,
-        .aobits = 12,
-        .ao_fifo_depth = 2048,
-        .ao_range_table = &range_ni_E_ao_ext,
-        .ao_unipolar = 1,
-        .ao_speed = 1000,
-        .num_p0_dio_channels = 8,
-        .caldac = {ad8804_debug},
-        .has_8255 = 0,
-        },
+               .name           = "pxi-6070e",
+               .n_adchan       = 16,
+               .adbits         = 12,
+               .ai_fifo_depth  = 512,
+               .alwaysdither   = 1,
+               .gainlkup       = ai_gain_16,
+               .ai_speed       = 800,
+               .n_aochan       = 2,
+               .aobits         = 12,
+               .ao_fifo_depth  = 2048,
+               .ao_range_table = &range_ni_E_ao_ext,
+               .ao_unipolar    = 1,
+               .ao_speed       = 1000,
+               .num_p0_dio_channels = 8,
+               .caldac         = { ad8804_debug },
+       },
        [BOARD_PXI6052E] = {
-        .name = "pxi-6052e",
-        .n_adchan = 16,
-        .adbits = 16,
-        .ai_fifo_depth = 512,
-        .alwaysdither = 1,
-        .gainlkup = ai_gain_16,
-        .ai_speed = 3000,
-        .n_aochan = 2,
-        .aobits = 16,
-        .ao_unipolar = 1,
-        .ao_fifo_depth = 2048,
-        .ao_range_table = &range_ni_E_ao_ext,
-        .ao_speed = 3000,
-        .num_p0_dio_channels = 8,
-        .caldac = {mb88341, mb88341, ad8522},
-        },
+               .name           = "pxi-6052e",
+               .n_adchan       = 16,
+               .adbits         = 16,
+               .ai_fifo_depth  = 512,
+               .alwaysdither   = 1,
+               .gainlkup       = ai_gain_16,
+               .ai_speed       = 3000,
+               .n_aochan       = 2,
+               .aobits         = 16,
+               .ao_unipolar    = 1,
+               .ao_fifo_depth  = 2048,
+               .ao_range_table = &range_ni_E_ao_ext,
+               .ao_speed       = 3000,
+               .num_p0_dio_channels = 8,
+               .caldac         = { mb88341, mb88341, ad8522 },
+       },
        [BOARD_PXI6031E] = {
-        .name = "pxi-6031e",
-        .n_adchan = 64,
-        .adbits = 16,
-        .ai_fifo_depth = 512,
-        .alwaysdither = 1,
-        .gainlkup = ai_gain_14,
-        .ai_speed = 10000,
-        .n_aochan = 2,
-        .aobits = 16,
-        .ao_fifo_depth = 2048,
-        .ao_range_table = &range_ni_E_ao_ext,
-        .ao_unipolar = 1,
-        .ao_speed = 10000,
-        .num_p0_dio_channels = 8,
-        .caldac = {dac8800, dac8043, ad8522},
-        },
+               .name           = "pxi-6031e",
+               .n_adchan       = 64,
+               .adbits         = 16,
+               .ai_fifo_depth  = 512,
+               .alwaysdither   = 1,
+               .gainlkup       = ai_gain_14,
+               .ai_speed       = 10000,
+               .n_aochan       = 2,
+               .aobits         = 16,
+               .ao_fifo_depth  = 2048,
+               .ao_range_table = &range_ni_E_ao_ext,
+               .ao_unipolar    = 1,
+               .ao_speed       = 10000,
+               .num_p0_dio_channels = 8,
+               .caldac         = { dac8800, dac8043, ad8522 },
+       },
        [BOARD_PCI6036E] = {
-        .name = "pci-6036e",
-        .n_adchan = 16,
-        .adbits = 16,
-        .ai_fifo_depth = 512,
-        .alwaysdither = 1,
-        .gainlkup = ai_gain_4,
-        .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,
-        },
+               .name = "pci-6036e",
+               .n_adchan       = 16,
+               .adbits         = 16,
+               .ai_fifo_depth  = 512,
+               .alwaysdither   = 1,
+               .gainlkup       = ai_gain_4,
+               .ai_speed       = 5000,
+               .n_aochan       = 2,
+               .aobits         = 16,
+               .ao_range_table = &range_bipolar10,
+               .ao_speed       = 100000,
+               .num_p0_dio_channels = 8,
+               .caldac         = { ad8804_debug },
+       },
        [BOARD_PCI6220] = {
-        .name = "pci-6220",
-        .n_adchan = 16,
-        .adbits = 16,
-        .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,
-        },
+               .name           = "pci-6220",
+               .n_adchan       = 16,
+               .adbits         = 16,
+               .ai_fifo_depth  = 512,          /* FIXME: guess */
+               .gainlkup       = ai_gain_622x,
+               .ai_speed       = 4000,
+               .num_p0_dio_channels = 8,
+               .reg_type       = ni_reg_622x,
+               .caldac         = { caldac_none },
+       },
        [BOARD_PCI6221] = {
-        .name = "pci-6221",
-        .n_adchan = 16,
-        .adbits = 16,
-        .ai_fifo_depth = 4095,
-        .gainlkup = ai_gain_622x,
-        .ai_speed = 4000,
-        .n_aochan = 2,
-        .aobits = 16,
-        .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,
-        },
+               .name           = "pci-6221",
+               .n_adchan       = 16,
+               .adbits         = 16,
+               .ai_fifo_depth  = 4095,
+               .gainlkup       = ai_gain_622x,
+               .ai_speed       = 4000,
+               .n_aochan       = 2,
+               .aobits         = 16,
+               .ao_fifo_depth  = 8191,
+               .ao_range_table = &range_ni_M_622x_ao,
+               .reg_type       = ni_reg_622x,
+               .ao_speed       = 1200,
+               .num_p0_dio_channels = 8,
+               .caldac         = { caldac_none },
+       },
        [BOARD_PCI6221_37PIN] = {
-        .name = "pci-6221_37pin",
-        .n_adchan = 16,
-        .adbits = 16,
-        .ai_fifo_depth = 4095,
-        .gainlkup = ai_gain_622x,
-        .ai_speed = 4000,
-        .n_aochan = 2,
-        .aobits = 16,
-        .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,
-        },
+               .name           = "pci-6221_37pin",
+               .n_adchan       = 16,
+               .adbits         = 16,
+               .ai_fifo_depth  = 4095,
+               .gainlkup       = ai_gain_622x,
+               .ai_speed       = 4000,
+               .n_aochan       = 2,
+               .aobits         = 16,
+               .ao_fifo_depth  = 8191,
+               .ao_range_table = &range_ni_M_622x_ao,
+               .reg_type       = ni_reg_622x,
+               .ao_speed       = 1200,
+               .num_p0_dio_channels = 8,
+               .caldac         = { caldac_none },
+       },
        [BOARD_PCI6224] = {
-        .name = "pci-6224",
-        .n_adchan = 32,
-        .adbits = 16,
-        .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,
-        },
+               .name           = "pci-6224",
+               .n_adchan       = 32,
+               .adbits         = 16,
+               .ai_fifo_depth  = 4095,
+               .gainlkup       = ai_gain_622x,
+               .ai_speed       = 4000,
+               .reg_type       = ni_reg_622x,
+               .num_p0_dio_channels = 32,
+               .caldac         = { caldac_none },
+       },
        [BOARD_PXI6224] = {
-        .name = "pxi-6224",
-        .n_adchan = 32,
-        .adbits = 16,
-        .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,
-        },
+               .name           = "pxi-6224",
+               .n_adchan       = 32,
+               .adbits         = 16,
+               .ai_fifo_depth  = 4095,
+               .gainlkup       = ai_gain_622x,
+               .ai_speed       = 4000,
+               .reg_type       = ni_reg_622x,
+               .num_p0_dio_channels = 32,
+               .caldac         = { caldac_none },
+       },
        [BOARD_PCI6225] = {
-        .name = "pci-6225",
-        .n_adchan = 80,
-        .adbits = 16,
-        .ai_fifo_depth = 4095,
-        .gainlkup = ai_gain_622x,
-        .ai_speed = 4000,
-        .n_aochan = 2,
-        .aobits = 16,
-        .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,
-        },
+               .name           = "pci-6225",
+               .n_adchan       = 80,
+               .adbits         = 16,
+               .ai_fifo_depth  = 4095,
+               .gainlkup       = ai_gain_622x,
+               .ai_speed       = 4000,
+               .n_aochan       = 2,
+               .aobits         = 16,
+               .ao_fifo_depth  = 8191,
+               .ao_range_table = &range_ni_M_622x_ao,
+               .reg_type       = ni_reg_622x,
+               .ao_speed       = 1200,
+               .num_p0_dio_channels = 32,
+               .caldac         = { caldac_none },
+       },
        [BOARD_PXI6225] = {
-        .name = "pxi-6225",
-        .n_adchan = 80,
-        .adbits = 16,
-        .ai_fifo_depth = 4095,
-        .gainlkup = ai_gain_622x,
-        .ai_speed = 4000,
-        .n_aochan = 2,
-        .aobits = 16,
-        .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,
+               .name           = "pxi-6225",
+               .n_adchan       = 80,
+               .adbits         = 16,
+               .ai_fifo_depth  = 4095,
+               .gainlkup       = ai_gain_622x,
+               .ai_speed       = 4000,
+               .n_aochan       = 2,
+               .aobits         = 16,
+               .ao_fifo_depth  = 8191,
+               .ao_range_table = &range_ni_M_622x_ao,
+               .reg_type       = ni_reg_622x,
+               .ao_speed       = 1200,
+               .num_p0_dio_channels = 32,
+               .caldac         = { caldac_none },
        },
        [BOARD_PCI6229] = {
-        .name = "pci-6229",
-        .n_adchan = 32,
-        .adbits = 16,
-        .ai_fifo_depth = 4095,
-        .gainlkup = ai_gain_622x,
-        .ai_speed = 4000,
-        .n_aochan = 4,
-        .aobits = 16,
-        .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,
-        },
+               .name           = "pci-6229",
+               .n_adchan       = 32,
+               .adbits         = 16,
+               .ai_fifo_depth  = 4095,
+               .gainlkup       = ai_gain_622x,
+               .ai_speed       = 4000,
+               .n_aochan       = 4,
+               .aobits         = 16,
+               .ao_fifo_depth  = 8191,
+               .ao_range_table = &range_ni_M_622x_ao,
+               .reg_type       = ni_reg_622x,
+               .ao_speed       = 1200,
+               .num_p0_dio_channels = 32,
+               .caldac         = { caldac_none },
+       },
        [BOARD_PCI6250] = {
-        .name = "pci-6250",
-        .n_adchan = 16,
-        .adbits = 16,
-        .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,
-        },
+               .name           = "pci-6250",
+               .n_adchan       = 16,
+               .adbits         = 16,
+               .ai_fifo_depth  = 4095,
+               .gainlkup       = ai_gain_628x,
+               .ai_speed       = 800,
+               .reg_type       = ni_reg_625x,
+               .num_p0_dio_channels = 8,
+               .caldac         = { caldac_none },
+       },
        [BOARD_PCI6251] = {
-        .name = "pci-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 = 350,
-        .num_p0_dio_channels = 8,
-        .caldac = {caldac_none},
-        .has_8255 = 0,
-        },
+               .name           = "pci-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_speed       = 350,
+               .num_p0_dio_channels = 8,
+               .caldac         = { caldac_none },
+       },
        [BOARD_PCIE6251] = {
-        .name = "pcie-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 = 350,
-        .num_p0_dio_channels = 8,
-        .caldac = {caldac_none},
-        .has_8255 = 0,
-        },
+               .name           = "pcie-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_speed       = 350,
+               .num_p0_dio_channels = 8,
+               .caldac         = { caldac_none },
+       },
        [BOARD_PXIE6251] = {
-        .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 = 350,
-        .num_p0_dio_channels = 8,
-        .caldac = {caldac_none},
-        .has_8255 = 0,
-        },
+               .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_speed       = 350,
+               .num_p0_dio_channels = 8,
+               .caldac         = { caldac_none },
+       },
        [BOARD_PCI6254] = {
-        .name = "pci-6254",
-        .n_adchan = 32,
-        .adbits = 16,
-        .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,
-        },
+               .name           = "pci-6254",
+               .n_adchan       = 32,
+               .adbits         = 16,
+               .ai_fifo_depth  = 4095,
+               .gainlkup       = ai_gain_628x,
+               .ai_speed       = 800,
+               .reg_type       = ni_reg_625x,
+               .num_p0_dio_channels = 32,
+               .caldac         = { caldac_none },
+       },
        [BOARD_PCI6259] = {
-        .name = "pci-6259",
-        .n_adchan = 32,
-        .adbits = 16,
-        .ai_fifo_depth = 4095,
-        .gainlkup = ai_gain_628x,
-        .ai_speed = 800,
-        .n_aochan = 4,
-        .aobits = 16,
-        .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,
-        },
+               .name           = "pci-6259",
+               .n_adchan       = 32,
+               .adbits         = 16,
+               .ai_fifo_depth  = 4095,
+               .gainlkup       = ai_gain_628x,
+               .ai_speed       = 800,
+               .n_aochan       = 4,
+               .aobits         = 16,
+               .ao_fifo_depth  = 8191,
+               .ao_range_table = &range_ni_M_625x_ao,
+               .reg_type       = ni_reg_625x,
+               .ao_speed       = 350,
+               .num_p0_dio_channels = 32,
+               .caldac         = { caldac_none },
+       },
        [BOARD_PCIE6259] = {
-        .name = "pcie-6259",
-        .n_adchan = 32,
-        .adbits = 16,
-        .ai_fifo_depth = 4095,
-        .gainlkup = ai_gain_628x,
-        .ai_speed = 800,
-        .n_aochan = 4,
-        .aobits = 16,
-        .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,
-        },
+               .name           = "pcie-6259",
+               .n_adchan       = 32,
+               .adbits         = 16,
+               .ai_fifo_depth  = 4095,
+               .gainlkup       = ai_gain_628x,
+               .ai_speed       = 800,
+               .n_aochan       = 4,
+               .aobits         = 16,
+               .ao_fifo_depth  = 8191,
+               .ao_range_table = &range_ni_M_625x_ao,
+               .reg_type       = ni_reg_625x,
+               .ao_speed       = 350,
+               .num_p0_dio_channels = 32,
+               .caldac         = { caldac_none },
+       },
        [BOARD_PCI6280] = {
-        .name = "pci-6280",
-        .n_adchan = 16,
-        .adbits = 18,
-        .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,
-        },
+               .name           = "pci-6280",
+               .n_adchan       = 16,
+               .adbits         = 18,
+               .ai_fifo_depth  = 2047,
+               .gainlkup       = ai_gain_628x,
+               .ai_speed       = 1600,
+               .ao_fifo_depth  = 8191,
+               .reg_type       = ni_reg_628x,
+               .num_p0_dio_channels = 8,
+               .caldac         = { caldac_none },
+       },
        [BOARD_PCI6281] = {
-        .name = "pci-6281",
-        .n_adchan = 16,
-        .adbits = 18,
-        .ai_fifo_depth = 2047,
-        .gainlkup = ai_gain_628x,
-        .ai_speed = 1600,
-        .n_aochan = 2,
-        .aobits = 16,
-        .ao_fifo_depth = 8191,
-        .ao_range_table = &range_ni_M_628x_ao,
-        .reg_type = ni_reg_628x,
-        .ao_unipolar = 1,
-        .ao_speed = 350,
-        .num_p0_dio_channels = 8,
-        .caldac = {caldac_none},
-        .has_8255 = 0,
-        },
+               .name           = "pci-6281",
+               .n_adchan       = 16,
+               .adbits         = 18,
+               .ai_fifo_depth  = 2047,
+               .gainlkup       = ai_gain_628x,
+               .ai_speed       = 1600,
+               .n_aochan       = 2,
+               .aobits         = 16,
+               .ao_fifo_depth  = 8191,
+               .ao_range_table = &range_ni_M_628x_ao,
+               .reg_type       = ni_reg_628x,
+               .ao_unipolar    = 1,
+               .ao_speed       = 350,
+               .num_p0_dio_channels = 8,
+               .caldac         = { caldac_none },
+       },
        [BOARD_PXI6281] = {
-        .name = "pxi-6281",
-        .n_adchan = 16,
-        .adbits = 18,
-        .ai_fifo_depth = 2047,
-        .gainlkup = ai_gain_628x,
-        .ai_speed = 1600,
-        .n_aochan = 2,
-        .aobits = 16,
-        .ao_fifo_depth = 8191,
-        .ao_range_table = &range_ni_M_628x_ao,
-        .reg_type = ni_reg_628x,
-        .ao_unipolar = 1,
-        .ao_speed = 350,
-        .num_p0_dio_channels = 8,
-        .caldac = {caldac_none},
-        .has_8255 = 0,
-        },
+               .name           = "pxi-6281",
+               .n_adchan       = 16,
+               .adbits         = 18,
+               .ai_fifo_depth  = 2047,
+               .gainlkup       = ai_gain_628x,
+               .ai_speed       = 1600,
+               .n_aochan       = 2,
+               .aobits         = 16,
+               .ao_fifo_depth  = 8191,
+               .ao_range_table = &range_ni_M_628x_ao,
+               .reg_type       = ni_reg_628x,
+               .ao_unipolar    = 1,
+               .ao_speed       = 350,
+               .num_p0_dio_channels = 8,
+               .caldac         = { caldac_none },
+       },
        [BOARD_PCI6284] = {
-        .name = "pci-6284",
-        .n_adchan = 32,
-        .adbits = 18,
-        .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,
-        },
+               .name           = "pci-6284",
+               .n_adchan       = 32,
+               .adbits         = 18,
+               .ai_fifo_depth  = 2047,
+               .gainlkup       = ai_gain_628x,
+               .ai_speed       = 1600,
+               .reg_type       = ni_reg_628x,
+               .num_p0_dio_channels = 32,
+               .caldac         = { caldac_none },
+       },
        [BOARD_PCI6289] = {
-        .name = "pci-6289",
-        .n_adchan = 32,
-        .adbits = 18,
-        .ai_fifo_depth = 2047,
-        .gainlkup = ai_gain_628x,
-        .ai_speed = 1600,
-        .n_aochan = 4,
-        .aobits = 16,
-        .ao_fifo_depth = 8191,
-        .ao_range_table = &range_ni_M_628x_ao,
-        .reg_type = ni_reg_628x,
-        .ao_unipolar = 1,
-        .ao_speed = 350,
-        .num_p0_dio_channels = 32,
-        .caldac = {caldac_none},
-        .has_8255 = 0,
-        },
+               .name           = "pci-6289",
+               .n_adchan       = 32,
+               .adbits         = 18,
+               .ai_fifo_depth  = 2047,
+               .gainlkup       = ai_gain_628x,
+               .ai_speed       = 1600,
+               .n_aochan       = 4,
+               .aobits         = 16,
+               .ao_fifo_depth  = 8191,
+               .ao_range_table = &range_ni_M_628x_ao,
+               .reg_type       = ni_reg_628x,
+               .ao_unipolar    = 1,
+               .ao_speed       = 350,
+               .num_p0_dio_channels = 32,
+               .caldac         = { caldac_none },
+       },
        [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},
-        },
+               .name           = "pci-6143",
+               .n_adchan       = 8,
+               .adbits         = 16,
+               .ai_fifo_depth  = 1024,
+               .gainlkup       = ai_gain_6143,
+               .ai_speed       = 4000,
+               .reg_type       = ni_reg_6143,
+               .num_p0_dio_channels = 8,
+               .caldac         = { ad8804_debug, ad8804_debug },
+       },
        [BOARD_PXI6143] = {
-        .name = "pxi-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},
-        },
+               .name           = "pxi-6143",
+               .n_adchan       = 8,
+               .adbits         = 16,
+               .ai_fifo_depth  = 1024,
+               .gainlkup       = ai_gain_6143,
+               .ai_speed       = 4000,
+               .reg_type       = ni_reg_6143,
+               .num_p0_dio_channels = 8,
+               .caldac         = { ad8804_debug, ad8804_debug },
+       },
 };
 
 struct ni_private {