Converted initialization of board array to modern standard (indent does
authorFrank Mori Hess <fmhess@speakeasy.net>
Wed, 12 Dec 2007 03:12:55 +0000 (03:12 +0000)
committerFrank Mori Hess <fmhess@speakeasy.net>
Wed, 12 Dec 2007 03:12:55 +0000 (03:12 +0000)
a slightly less bad job of indenting it this way).

comedi/drivers/ni_pcimio.c

index 51693c650f58f795e63c1c6b8f2c1ed52d29d053..cffd0da768c3d0289e967182fb6216c3358dbcb6 100644 (file)
@@ -214,920 +214,972 @@ static const comedi_lrange range_ni_M_622x_ao = { 1, {
 };
 
 static const ni_board ni_boards[] = {
-      {device_id:0x0162,       // NI also says 0x1620.  typo?
-             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,
+       {
+                       .device_id = 0x0162,    // NI also says 0x1620.  typo?
+                       .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,
+                       .ao_unipolar = 0,
+                       .ao_speed = 50000,
                        .num_p0_dio_channels = 8,
-             caldac:   {dac8800, dac8043},
-             has_8255:0,
+                       .caldac = {dac8800, dac8043},
+                       .has_8255 = 0,
                },
-      {device_id:0x1170,
-             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,
+       {
+                       .device_id = 0x1170,
+                       .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,
+                       .ao_unipolar = 1,
+                       .ao_speed = 10000,
                        .num_p0_dio_channels = 8,
-             caldac:   {dac8800, dac8043, ad8522},
-             has_8255:0,
+                       .caldac = {dac8800, dac8043, ad8522},
+                       .has_8255 = 0,
                },
-      {device_id:0x28c0,
-             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,
+       {
+                       .device_id = 0x28c0,
+                       .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,
+                       .ao_unipolar = 0,
+                       .ao_speed = 100000,
                        .num_p0_dio_channels = 8,
-             caldac:   {ad8804_debug},
-             has_8255:0,
+                       .caldac = {ad8804_debug},
+                       .has_8255 = 0,
                },
-      {device_id:0x11d0,
-             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,
+       {
+                       .device_id = 0x11d0,
+                       .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,
+                       .ao_unipolar = 1,
+                       .ao_speed = 10000,
                        .num_p0_dio_channels = 8,
-             caldac:   {dac8800, dac8043, ad8522},
-             has_8255:0,
+                       .caldac = {dac8800, dac8043, ad8522},
+                       .has_8255 = 0,
                },
-
-      {device_id:0x1180,
-             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,
+       {
+                       .device_id = 0x1180,
+                       .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,
+                       .ao_unipolar = 1,
+                       .ao_speed = 1000,
                        .num_p0_dio_channels = 8,
-             caldac:   {mb88341},
-             has_8255:0,
+                       .caldac = {mb88341},
+                       .has_8255 = 0,
                },
-      {device_id:0x1190,
-             name:     "pci-mio-16e-4",        /* aka pci-6040e */
-             n_adchan:16,
-             adbits:   12,
-             ai_fifo_depth:512,
-             alwaysdither:0,
-             gainlkup:ai_gain_16,
+       {
+                       .device_id = 0x1190,
+                       .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,
+                       .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,
+                       .ao_unipolar = 1,
+                       .ao_speed = 1000,
                        .num_p0_dio_channels = 8,
-             caldac:   {ad8804_debug}, // doc says mb88341
-             has_8255:0,
+                       .caldac = {ad8804_debug},       // doc says mb88341
+                       .has_8255 = 0,
                },
-      {device_id:0x11c0,
-             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,
+       {
+                       .device_id = 0x11c0,
+                       .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,
+                       .ao_unipolar = 1,
+                       .ao_speed = 1000,
                        .num_p0_dio_channels = 8,
-             caldac:   {mb88341},
-             has_8255:0,
+                       .caldac = {mb88341},
+                       .has_8255 = 0,
                },
 
-      {device_id:0x1330,
-             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,
+       {
+                       .device_id = 0x1330,
+                       .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,
+                       .ao_unipolar = 1,
+                       .ao_speed = 10000,
                        .num_p0_dio_channels = 8,
-             caldac:   {dac8800, dac8043, ad8522},
-             has_8255:0,
+                       .caldac = {dac8800, dac8043, ad8522},
+                       .has_8255 = 0,
                },
-      {device_id:0x1270,
-             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,
+       {
+                       .device_id = 0x1270,
+                       .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,
+                       .caldac = {dac8800, dac8043, ad8522},
+                       .has_8255 = 0,
                },
-      {device_id:0x1340,
-             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,
+       {
+                       .device_id = 0x1340,
+                       .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,
+                       .caldac = {dac8800, dac8043, ad8522},
+                       .has_8255 = 0,
                },
-      {device_id:0x1350,
-             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,
+       {
+                       .device_id = 0x1350,
+                       .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,
+                       .ao_unipolar = 1,
+                       .ao_speed = 1000,
                        .num_p0_dio_channels = 8,
-             caldac:   {ad8804_debug},
-             has_8255:0,
+                       .caldac = {ad8804_debug},
+                       .has_8255 = 0,
                },
-      {device_id:0x2a60,
-             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,
+       {
+                       .device_id = 0x2a60,
+                       .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,
+                       .caldac = {ad8804_debug},       /* manual is wrong */
+                       .has_8255 = 0,
                },
-      {device_id:0x2a70,
-             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,
+       {
+                       .device_id = 0x2a70,
+                       .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,
+                       .ao_unipolar = 0,
+                       .ao_speed = 100000,
                        .num_p0_dio_channels = 8,
-             caldac:   {ad8804_debug}, /* manual is wrong */
-             has_8255:0,
+                       .caldac = {ad8804_debug},       /* manual is wrong */
+                       .has_8255 = 0,
                },
-      {device_id:0x2a80,
-             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,
+       {
+                       .device_id = 0x2a80,
+                       .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,
+                       .ao_unipolar = 0,
+                       .ao_speed = 100000,
                        .num_p0_dio_channels = 8,
-             caldac:   {ad8804_debug}, /* manual is wrong */
-             has_8255:1,
+                       .caldac = {ad8804_debug},       /* manual is wrong */
+                       .has_8255 = 1,
                },
-      {device_id:0x2ab0,
-             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,
+       {
+                       .device_id = 0x2ab0,
+                       .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,
+                       .ao_unipolar = 1,
+                       .ao_speed = 100000,
                        .num_p0_dio_channels = 8,
-             caldac:   {ad8804_debug}, /* manual is wrong */
-             has_8255:1,
+                       .caldac = {ad8804_debug},       /* manual is wrong */
+                       .has_8255 = 1,
                },
 
-      {device_id:0x2ca0,
-             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,
+       {
+                       .device_id = 0x2ca0,
+                       .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,
+                       .caldac = {ad8804_debug},
+                       .has_8255 = 0,
                },
-      {device_id:0x2c80,
-             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,
+       {
+                       .device_id = 0x2c80,
+                       .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,
+                       .ao_unipolar = 0,
+                       .ao_speed = 100000,
                        .num_p0_dio_channels = 8,
-             caldac:   {ad8804_debug},
-             has_8255:0,
+                       .caldac = {ad8804_debug},
+                       .has_8255 = 0,
                },
-      {device_id:0x18b0,
-             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,
+       {
+                       .device_id = 0x18b0,
+                       .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,
+                       .ao_speed = 3000,
                        .num_p0_dio_channels = 8,
-             caldac:   {ad8804_debug, ad8804_debug, ad8522},   /* manual is wrong */
+                       .caldac = {ad8804_debug, ad8804_debug, ad8522}, /* manual is wrong */
                },
-      {device_id:0x14e0,
-             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,
+       {.device_id = 0x14e0,
+                       .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,
+                       .ao_unipolar = 0,
+                       .ao_fifo_depth = 2048,
+                       .ao_speed = 250,
                        .num_p0_dio_channels = 8,
-             caldac:   {ad8804, ad8804},
+                       .caldac = {ad8804, ad8804},
                },
-      {device_id:0x14f0,
-             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,
+       {
+                       .device_id = 0x14f0,
+                       .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,
+                       .ao_unipolar = 0,
+                       .ao_fifo_depth = 2048,
+                       .ao_speed = 250,
                        .num_p0_dio_channels = 8,
-             caldac:   {ad8804, ad8804},
+                       .caldac = {ad8804, ad8804},
                },
 #if 0
        /* The 6115 boards probably need their own driver */
-      {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,
+       {
+                       .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 */
+                       .reg_611x = 1,
+                       .caldac = {ad8804_debug, ad8804_debug, ad8804_debug},   /* XXX */
                },
 #endif
 #if 0
-      {device_id:0x0000,
-             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,
+       {
+                       .device_id = 0x0000,
+                       .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 */
+                       caldac = {ad8804_debug, ad8804_debug, ad8804_debug},    /* XXX */
                },
 #endif
-      {device_id:0x1880,
-             name:     "pci-6711",
-             n_adchan:0,       /* no analog input */
-             n_aochan:4,
-             aobits:   12,
-             ao_unipolar:0,
-             ao_fifo_depth:16384,
+       {
+                       .device_id = 0x1880,
+                       .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,
+                       .ao_speed = 1000,
                        .num_p0_dio_channels = 8,
-             reg_type:ni_reg_6711,
-             caldac:   {ad8804_debug},
+                       .reg_type = ni_reg_6711,
+                       .caldac = {ad8804_debug},
                },
-      {device_id:0x2b90,
-             name:     "pxi-6711",
-             n_adchan:0,       /* no analog input */
-             n_aochan:4,
-             aobits:   12,
-             ao_unipolar:0,
-             ao_fifo_depth:16384,
+       {
+                       .device_id = 0x2b90,
+                       .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,
+                       .ao_speed = 1000,
                        .num_p0_dio_channels = 8,
-             reg_type:ni_reg_6711,
-             caldac:   {ad8804_debug},
+                       .reg_type = ni_reg_6711,
+                       .caldac = {ad8804_debug},
                },
-      {device_id:0x1870,
-             name:     "pci-6713",
-             n_adchan:0,       /* no analog input */
-             n_aochan:8,
-             aobits:   12,
-             ao_unipolar:0,
-             ao_fifo_depth:16384,
+       {
+                       .device_id = 0x1870,
+                       .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,
+                       .ao_speed = 1000,
                        .num_p0_dio_channels = 8,
-             reg_type:ni_reg_6713,
-             caldac:   {ad8804_debug, ad8804_debug},
+                       .reg_type = ni_reg_6713,
+                       .caldac = {ad8804_debug, ad8804_debug},
                },
-      {device_id:0x2b80,
-             name:     "pxi-6713",
-             n_adchan:0,       /* no analog input */
-             n_aochan:8,
-             aobits:   12,
-             ao_unipolar:0,
-             ao_fifo_depth:16384,
+       {
+                       .device_id = 0x2b80,
+                       .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,
+                       .ao_speed = 1000,
                        .num_p0_dio_channels = 8,
-             reg_type:ni_reg_6713,
-             caldac:   {ad8804_debug, ad8804_debug},
+                       .reg_type = ni_reg_6713,
+                       .caldac = {ad8804_debug, ad8804_debug},
                },
-      {device_id:0x2430,
-             name:     "pci-6731",
-             n_adchan:0,       /* no analog input */
-             n_aochan:4,
-             aobits:   16,
-             ao_unipolar:0,
-             ao_fifo_depth:8192,
+       {
+                       .device_id = 0x2430,
+                       .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,
+                       .ao_speed = 1000,
                        .num_p0_dio_channels = 8,
-             reg_type:ni_reg_6711,
-             caldac:   {ad8804_debug},
+                       .reg_type = ni_reg_6711,
+                       .caldac = {ad8804_debug},
                },
 #if 0                          /* need device ids */
-      {device_id:0x0,
-             name:     "pxi-6731",
-             n_adchan:0,       /* no analog input */
-             n_aochan:4,
-             aobits:   16,
-             ao_unipolar:0,
-             ao_fifo_depth:8192,
+       {
+                       .device_id = 0x0,
+                       .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},
+                       .reg_type = ni_reg_6711,
+                       .caldac = {ad8804_debug},
                },
 #endif
-      {device_id:0x2410,
-             name:     "pci-6733",
-             n_adchan:0,       /* no analog input */
-             n_aochan:8,
-             aobits:   16,
-             ao_unipolar:0,
-             ao_fifo_depth:16384,
+       {
+                       .device_id = 0x2410,
+                       .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,
+                       .ao_speed = 1000,
                        .num_p0_dio_channels = 8,
-             reg_type:ni_reg_6713,
-             caldac:   {ad8804_debug, ad8804_debug},
+                       .reg_type = ni_reg_6713,
+                       .caldac = {ad8804_debug, ad8804_debug},
                },
-      {device_id:0x2420,
-             name:     "pxi-6733",
-             n_adchan:0,       /* no analog input */
-             n_aochan:8,
-             aobits:   16,
-             ao_unipolar:0,
-             ao_fifo_depth:16384,
+       {
+                       .device_id = 0x2420,
+                       .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,
+                       .ao_speed = 1000,
                        .num_p0_dio_channels = 8,
-             reg_type:ni_reg_6713,
-             caldac:   {ad8804_debug, ad8804_debug},
+                       .reg_type = ni_reg_6713,
+                       .caldac = {ad8804_debug, ad8804_debug},
                },
-      {device_id:0x15b0,
-             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,
+       {
+                       .device_id = 0x15b0,
+                       .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,
+                       .ao_unipolar = 1,
+                       .ao_speed = 1000,
                        .num_p0_dio_channels = 8,
-             caldac:   {ad8804_debug},
-             has_8255:0,
+                       .caldac = {ad8804_debug},
+                       .has_8255 = 0,
                },
-      {device_id:0x11b0,
-             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,
+       {
+                       .device_id = 0x11b0,
+                       .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,
+                       .ao_unipolar = 1,
+                       .ao_speed = 1000,
                        .num_p0_dio_channels = 8,
-             caldac:   {ad8804_debug},
-             has_8255:0,
+                       .caldac = {ad8804_debug},
+                       .has_8255 = 0,
                },
-      {device_id:0x18c0,
-             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,
+       {
+                       .device_id = 0x18c0,
+                       .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,
+                       .ao_speed = 3000,
                        .num_p0_dio_channels = 8,
-             caldac:   {mb88341, mb88341, ad8522},
+                       .caldac = {mb88341, mb88341, ad8522},
                },
-      {device_id:0x1580,
-             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,
+       {
+                       .device_id = 0x1580,
+                       .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,
+                       .ao_unipolar = 1,
+                       .ao_speed = 10000,
                        .num_p0_dio_channels = 8,
-             caldac:   {dac8800, dac8043, ad8522},
+                       .caldac = {dac8800, dac8043, ad8522},
                },
-      {device_id:0x2890,
-             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,
+       {
+                       .device_id = 0x2890,
+                       .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,
+                       .ao_unipolar = 0,
+                       .ao_speed = 100000,
                        .num_p0_dio_channels = 8,
-             caldac:   {ad8804_debug},
-             has_8255:0,
+                       .caldac = {ad8804_debug},
+                       .has_8255 = 0,
                },
-      {device_id:0x70b0,
-             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,
+       {
+                       .device_id = 0x70b0,
+                       .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,
+                       .reg_type = ni_reg_622x,
+                       .ao_unipolar = 0,
                        .caldac = {caldac_none},
-             has_8255:0,
+                       .has_8255 = 0,
                },
-      {device_id:0x70af,
-             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,
+       {
+                       .device_id = 0x70af,
+                       .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,
+                       .reg_type = ni_reg_622x,
+                       .ao_unipolar = 0,
+                       .ao_speed = 1200,
                        .num_p0_dio_channels = 8,
                        .caldac = {caldac_none},
-             has_8255:0,
+                       .has_8255 = 0,
                },
-      {device_id:0x71bc,
-             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,
+       {
+                       .device_id = 0x71bc,
+                       .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,
+                       .reg_type = ni_reg_622x,
+                       .ao_unipolar = 0,
+                       .ao_speed = 1200,
                        .num_p0_dio_channels = 8,
                        .caldac = {caldac_none},
-             has_8255:0,
+                       .has_8255 = 0,
                },
-      {device_id:0x70f2,
-             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,
+       {
+                       .device_id = 0x70f2,
+                       .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,
+                       .has_8255 = 0,
                },
-      {device_id:0x716c,
-             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,
+       {
+                       .device_id = 0x716c,
+                       .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,
+                       .reg_type = ni_reg_622x,
+                       .ao_unipolar = 0,
+                       .ao_speed = 1200,
                        .num_p0_dio_channels = 32,
                        .caldac = {caldac_none},
-             has_8255:0,
+                       .has_8255 = 0,
                },
-      {device_id:0x70aa,
-             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,
+       {
+                       .device_id = 0x70aa,
+                       .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,
+                       .reg_type = ni_reg_622x,
+                       .ao_unipolar = 0,
+                       .ao_speed = 1200,
                        .num_p0_dio_channels = 32,
                        .caldac = {caldac_none},
-             has_8255:0,
+                       .has_8255 = 0,
                },
-      {device_id:0x70b4,
-             name:     "pci-6250",
-             n_adchan:16,
-             adbits:   16,
-             ai_fifo_depth:4095,
+       {
+                       .device_id = 0x70b4,
+                       .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,
+                       .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,
+                       .has_8255 = 0,
                },
-      {device_id:0x70b8,
-             name:     "pci-6251",
-             n_adchan:16,
-             adbits:   16,
-             ai_fifo_depth:4095,
+       {
+                       .device_id = 0x70b8,
+                       .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,
+                       .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,
+                       .reg_type = ni_reg_625x,
+                       .ao_unipolar = 0,
+                       .ao_speed = 357,
                        .num_p0_dio_channels = 8,
                        .caldac = {caldac_none},
-             has_8255:0,
+                       .has_8255 = 0,
                },
-      {device_id:0x717d,
-             name:     "pcie-6251",
-             n_adchan:16,
-             adbits:   16,
-             ai_fifo_depth:4095,
+       {
+                       .device_id = 0x717d,
+                       .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,
+                       .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,
+                       .reg_type = ni_reg_625x,
+                       .ao_unipolar = 0,
+                       .ao_speed = 357,
                        .num_p0_dio_channels = 8,
                        .caldac = {caldac_none},
-             has_8255:0,
+                       .has_8255 = 0,
                },
-      {device_id:0x70b7,
-             name:     "pci-6254",
-             n_adchan:32,
-             adbits:   16,
-             ai_fifo_depth:4095,
+       {
+                       .device_id = 0x70b7,
+                       .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,
+                       .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,
+                       .has_8255 = 0,
                },
-      {device_id:0x70ab,
-             name:     "pci-6259",
-             n_adchan:32,
-             adbits:   16,
-             ai_fifo_depth:4095,
+       {
+                       .device_id = 0x70ab,
+                       .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,
+                       .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:357,
+                       .reg_type = ni_reg_625x,
+                       .ao_unipolar = 0,
+                       .ao_speed = 357,
                        .num_p0_dio_channels = 32,
                        .caldac = {caldac_none},
-             has_8255:0,
+                       .has_8255 = 0,
                },
-      {device_id:0x717f,
-             name:     "pcie-6259",
-             n_adchan:32,
-             adbits:   16,
-             ai_fifo_depth:4095,
+       {
+                       .device_id = 0x717f,
+                       .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,
+                       .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:357,
+                       .reg_type = ni_reg_625x,
+                       .ao_unipolar = 0,
+                       .ao_speed = 357,
                        .num_p0_dio_channels = 32,
                        .caldac = {caldac_none},
-             has_8255:0,
+                       .has_8255 = 0,
                },
-      {device_id:0x70b6,
-             name:     "pci-6280",
-             n_adchan:16,
-             adbits:   18,
-             ai_fifo_depth:2047,
+       {
+                       .device_id = 0x70b6,
+                       .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,
+                       .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,
+                       .has_8255 = 0,
                },
-      {device_id:0x70bd,
-             name:     "pci-6281",
-             n_adchan:16,
-             adbits:   18,
-             ai_fifo_depth:2047,
+       {
+                       .device_id = 0x70bd,
+                       .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,
+                       .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:357,
+                       .reg_type = ni_reg_628x,
+                       .ao_unipolar = 1,
+                       .ao_speed = 357,
                        .num_p0_dio_channels = 8,
                        .caldac = {caldac_none},
-             has_8255:0,
+                       .has_8255 = 0,
                },
-      {device_id:0x70bf,
-             name:     "pxi-6281",
-             n_adchan:16,
-             adbits:   18,
-             ai_fifo_depth:2047,
+       {
+                       .device_id = 0x70bf,
+                       .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,
+                       .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:357,
+                       .reg_type = ni_reg_628x,
+                       .ao_unipolar = 1,
+                       .ao_speed = 357,
                        .num_p0_dio_channels = 8,
                        .caldac = {caldac_none},
-             has_8255:0,
+                       .has_8255 = 0,
                },
-      {device_id:0x70bc,
-             name:     "pci-6284",
-             n_adchan:32,
-             adbits:   18,
-             ai_fifo_depth:2047,
+       {
+                       .device_id = 0x70bc,
+                       .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,
+                       .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,
+                       .has_8255 = 0,
                },
-      {device_id:0x70ac,
-             name:     "pci-6289",
-             n_adchan:32,
-             adbits:   18,
-             ai_fifo_depth:2047,
+       {
+                       .device_id = 0x70ac,
+                       .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,
+                       .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:357,
+                       .reg_type = ni_reg_628x,
+                       .ao_unipolar = 1,
+                       .ao_speed = 357,
                        .num_p0_dio_channels = 32,
                        .caldac = {caldac_none},
-             has_8255:0,
+                       .has_8255 = 0,
                },
-      {device_id:0x70C0,
-             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,
+       {
+                       .device_id = 0x70C0,
+                       .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},
                },
-      {device_id:0x710D,
-             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,
+       {
+                       .device_id = 0x710D,
+                       .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},
                },