OSDN Git Service

staging: comedi: ni_mio_cs: cleanup the boardinfo declaration
authorH Hartley Sweeten <hartleys@visionengravers.com>
Sat, 26 Jan 2013 00:35:55 +0000 (17:35 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 30 Jan 2013 04:08:23 +0000 (23:08 -0500)
For aesthetic reasons, reformat the boardinfo declaration and
add some whitespace. Remove all the information that is set to
'0' as this is the default.

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>
drivers/staging/comedi/drivers/ni_mio_cs.c

index 4e03c46..07e4bd8 100644 (file)
@@ -65,104 +65,84 @@ See the notes in the ni_atmio.o driver.
 #define MAX_N_CALDACS 32
 
 static const struct ni_board_struct ni_boards[] = {
-       {.device_id = 0x010d,
-        .name = "DAQCard-ai-16xe-50",
-        .n_adchan = 16,
-        .adbits = 16,
-        .ai_fifo_depth = 1024,
-        .alwaysdither = 0,
-        .gainlkup = ai_gain_8,
-        .ai_speed = 5000,
-        .n_aochan = 0,
-        .aobits = 0,
-        .ao_fifo_depth = 0,
-        .ao_unipolar = 0,
-        .num_p0_dio_channels = 8,
-        .has_8255 = 0,
-        .caldac = {dac8800, dac8043},
-        },
-       {.device_id = 0x010c,
-        .name = "DAQCard-ai-16e-4",
-        .n_adchan = 16,
-        .adbits = 12,
-        .ai_fifo_depth = 1024,
-        .alwaysdither = 0,
-        .gainlkup = ai_gain_16,
-        .ai_speed = 4000,
-        .n_aochan = 0,
-        .aobits = 0,
-        .ao_fifo_depth = 0,
-        .ao_unipolar = 0,
-        .num_p0_dio_channels = 8,
-        .has_8255 = 0,
-        .caldac = {mb88341},   /* verified */
-        },
-       {.device_id = 0x02c4,
-        .name = "DAQCard-6062E",
-        .n_adchan = 16,
-        .adbits = 12,
-        .ai_fifo_depth = 8192,
-        .alwaysdither = 0,
-        .gainlkup = ai_gain_16,
-        .ai_speed = 2000,
-        .n_aochan = 2,
-        .aobits = 12,
-        .ao_fifo_depth = 2048,
-        .ao_range_table = &range_bipolar10,
-        .ao_unipolar = 0,
-        .ao_speed = 1176,
-        .num_p0_dio_channels = 8,
-        .has_8255 = 0,
-        .caldac = {ad8804_debug},      /* verified */
-        },
-       {.device_id = 0x075e,
-        .name = "DAQCard-6024E",       /* specs incorrect! */
-        .n_adchan = 16,
-        .adbits = 12,
-        .ai_fifo_depth = 1024,
-        .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 = 1000000,
-        .num_p0_dio_channels = 8,
-        .has_8255 = 0,
-        .caldac = {ad8804_debug},
-        },
-       {.device_id = 0x0245,
-        .name = "DAQCard-6036E",       /* specs incorrect! */
-        .n_adchan = 16,
-        .adbits = 16,
-        .ai_fifo_depth = 1024,
-        .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 = 1000000,
-        .num_p0_dio_channels = 8,
-        .has_8255 = 0,
-        .caldac = {ad8804_debug},
+       {
+               .device_id      = 0x010d,
+               .name           = "DAQCard-ai-16xe-50",
+               .n_adchan       = 16,
+               .adbits         = 16,
+               .ai_fifo_depth  = 1024,
+               .gainlkup       = ai_gain_8,
+               .ai_speed       = 5000,
+               .num_p0_dio_channels = 8,
+               .caldac         = { dac8800, dac8043 },
+       }, {
+               .device_id      = 0x010c,
+               .name           = "DAQCard-ai-16e-4",
+               .n_adchan       = 16,
+               .adbits         = 12,
+               .ai_fifo_depth  = 1024,
+               .gainlkup       = ai_gain_16,
+               .ai_speed       = 4000,
+               .num_p0_dio_channels = 8,
+               .caldac         = { mb88341 },          /* verified */
+       }, {
+               .device_id      = 0x02c4,
+               .name           = "DAQCard-6062E",
+               .n_adchan       = 16,
+               .adbits         = 12,
+               .ai_fifo_depth  = 8192,
+               .gainlkup       = ai_gain_16,
+               .ai_speed       = 2000,
+               .n_aochan       = 2,
+               .aobits         = 12,
+               .ao_fifo_depth  = 2048,
+               .ao_range_table = &range_bipolar10,
+               .ao_speed       = 1176,
+               .num_p0_dio_channels = 8,
+               .caldac         = { ad8804_debug },     /* verified */
+        }, {
+               /* specs incorrect! */
+               .device_id      = 0x075e,
+               .name           = "DAQCard-6024E",
+               .n_adchan       = 16,
+               .adbits         = 12,
+               .ai_fifo_depth  = 1024,
+               .gainlkup       = ai_gain_4,
+               .ai_speed       = 5000,
+               .n_aochan       = 2,
+               .aobits         = 12,
+               .ao_range_table = &range_bipolar10,
+               .ao_speed       = 1000000,
+               .num_p0_dio_channels = 8,
+               .caldac         = { ad8804_debug },
+       }, {
+               /* specs incorrect! */
+               .device_id      = 0x0245,
+               .name           = "DAQCard-6036E",
+               .n_adchan       = 16,
+               .adbits         = 16,
+               .ai_fifo_depth  = 1024,
+               .alwaysdither   = 1,
+               .gainlkup       = ai_gain_4,
+               .ai_speed       = 5000,
+               .n_aochan       = 2,
+               .aobits         = 16,
+               .ao_range_table = &range_bipolar10,
+               .ao_speed       = 1000000,
+               .num_p0_dio_channels = 8,
+               .caldac         = { ad8804_debug },
         },
 #if 0
-       {.device_id = 0x0000,   /* unknown */
-        .name = "DAQCard-6715",
-        .n_adchan = 0,
-        .n_aochan = 8,
-        .aobits = 12,
-        .ao_671x = 8192,
-        .num_p0_dio_channels = 8,
-        .caldac = {mb88341, mb88341},
-        },
+       {
+               .device_id      = 0x0000,       /* unknown */
+               .name           = "DAQCard-6715",
+               .n_aochan       = 8,
+               .aobits         = 12,
+               .ao_671x        = 8192,
+               .num_p0_dio_channels = 8,
+               .caldac         = { mb88341, mb88341 },
+       },
 #endif
-       /* N.B. Update ni_mio_cs_ids[] when entries added above. */
 };
 
 #define interrupt_pin(a)       0