dect/linux-2.6
Archived
14
0
Fork 0
Code Releases Activity

staging: comedi: rtd520: cleanup the range tables

Browse source 
Change the whitespace of the range tables to avoid the > 80
character lines and the ugly line breaks. Convert a couple of
the RANGE() values into the appropriate {UNI,BIP}_RANGE().

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>
This commit is contained in:
H Hartley Sweeten 2012-07-10 17:26:04 -07:00 committed by Greg Kroah-Hartman
parent 26550b32e1
commit feb153f326
1 changed files with 63 additions and 91 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

154
drivers/staging/comedi/drivers/rtd520.c
View file

@ -194,103 +194,75 @@ Configuration options:
======================================================================*/ ======================================================================*/
/* /*
The board has 3 input modes and the gains of 1,2,4,...32 (, 64, 128) * The board has 3 input modes and the gains of 1,2,4,...32 (, 64, 128)
*/ */
static const struct comedi_lrange rtd_ai_7520_range = { 18, { static const struct comedi_lrange rtd_ai_7520_range = {
/* +-5V input range gain steps */ 18, {
BIP_RANGE(5.0), /* +-5V input range gain steps */
BIP_RANGE(5.0 / 2), BIP_RANGE(5.0),
BIP_RANGE(5.0 / 4), BIP_RANGE(5.0 / 2),
BIP_RANGE(5.0 / 8), BIP_RANGE(5.0 / 4),
BIP_RANGE(5.0 / BIP_RANGE(5.0 / 8),
16), BIP_RANGE(5.0 / 16),
BIP_RANGE(5.0 / BIP_RANGE(5.0 / 32),
32), /* +-10V input range gain steps */
/* +-10V input range gain steps */ BIP_RANGE(10.0),
BIP_RANGE(10.0), BIP_RANGE(10.0 / 2),
BIP_RANGE(10.0 / BIP_RANGE(10.0 / 4),
2), BIP_RANGE(10.0 / 8),
BIP_RANGE(10.0 / BIP_RANGE(10.0 / 16),
4), BIP_RANGE(10.0 / 32),
BIP_RANGE(10.0 / /* +10V input range gain steps */
8), UNI_RANGE(10.0),
BIP_RANGE(10.0 / UNI_RANGE(10.0 / 2),
16), UNI_RANGE(10.0 / 4),
BIP_RANGE(10.0 / UNI_RANGE(10.0 / 8),
32), UNI_RANGE(10.0 / 16),
/* +10V input range gain steps */ UNI_RANGE(10.0 / 32),
UNI_RANGE(10.0), }
UNI_RANGE(10.0 /
2),
UNI_RANGE(10.0 /
4),
UNI_RANGE(10.0 /
8),
UNI_RANGE(10.0 /
16),
UNI_RANGE(10.0 /
32),
}
}; };
/* PCI4520 has two more gains (6 more entries) */ /* PCI4520 has two more gains (6 more entries) */
static const struct comedi_lrange rtd_ai_4520_range = { 24, { static const struct comedi_lrange rtd_ai_4520_range = {
/* +-5V input range gain steps */ 24, {
BIP_RANGE(5.0), /* +-5V input range gain steps */
BIP_RANGE(5.0 / 2), BIP_RANGE(5.0),
BIP_RANGE(5.0 / 4), BIP_RANGE(5.0 / 2),
BIP_RANGE(5.0 / 8), BIP_RANGE(5.0 / 4),
BIP_RANGE(5.0 / BIP_RANGE(5.0 / 8),
16), BIP_RANGE(5.0 / 16),
BIP_RANGE(5.0 / BIP_RANGE(5.0 / 32),
32), BIP_RANGE(5.0 / 64),
BIP_RANGE(5.0 / BIP_RANGE(5.0 / 128),
64), /* +-10V input range gain steps */
BIP_RANGE(5.0 / BIP_RANGE(10.0),
128), BIP_RANGE(10.0 / 2),
/* +-10V input range gain steps */ BIP_RANGE(10.0 / 4),
BIP_RANGE(10.0), BIP_RANGE(10.0 / 8),
BIP_RANGE(10.0 / BIP_RANGE(10.0 / 16),
2), BIP_RANGE(10.0 / 32),
BIP_RANGE(10.0 / BIP_RANGE(10.0 / 64),
4), BIP_RANGE(10.0 / 128),
BIP_RANGE(10.0 / /* +10V input range gain steps */
8), UNI_RANGE(10.0),
BIP_RANGE(10.0 / UNI_RANGE(10.0 / 2),
16), UNI_RANGE(10.0 / 4),
BIP_RANGE(10.0 / UNI_RANGE(10.0 / 8),
32), UNI_RANGE(10.0 / 16),
BIP_RANGE(10.0 / UNI_RANGE(10.0 / 32),
64), UNI_RANGE(10.0 / 64),
BIP_RANGE(10.0 / UNI_RANGE(10.0 / 128),
128), }
/* +10V input range gain steps */
UNI_RANGE(10.0),
UNI_RANGE(10.0 /
2),
UNI_RANGE(10.0 /
4),
UNI_RANGE(10.0 /
8),
UNI_RANGE(10.0 /
16),
UNI_RANGE(10.0 /
32),
UNI_RANGE(10.0 /
64),
UNI_RANGE(10.0 /
128),
}
}; };
/* Table order matches range values */ /* Table order matches range values */
static const struct comedi_lrange rtd_ao_range = { 4, { static const struct comedi_lrange rtd_ao_range = {
RANGE(0, 5), 4, {
RANGE(0, 10), UNI_RANGE(5),
RANGE(-5, 5), UNI_RANGE(10),
RANGE(-10, 10), BIP_RANGE(5),
} BIP_RANGE(10),
}
}; };
/* /*