Commit b464f791 authored by Mark Rankilor's avatar Mark Rankilor Committed by Greg Kroah-Hartman

Staging: comedi: Fixed long line lengths in comedi.h

This patches fixes long line lengths in comedi.h that were picked up by
checkpatch.pl
Signed-off-by: default avatarMark Rankilor <reodge@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 6c7f8196
...@@ -465,7 +465,8 @@ ...@@ -465,7 +465,8 @@
#define COMEDI_CB_EOS 1 /* end of scan */ #define COMEDI_CB_EOS 1 /* end of scan */
#define COMEDI_CB_EOA 2 /* end of acquisition */ #define COMEDI_CB_EOA 2 /* end of acquisition */
#define COMEDI_CB_BLOCK 4 /* data has arrived: wakes up read() / write() */ #define COMEDI_CB_BLOCK 4 /* data has arrived:
* wakes up read() / write() */
#define COMEDI_CB_EOBUF 8 /* DEPRECATED: end of buffer */ #define COMEDI_CB_EOBUF 8 /* DEPRECATED: end of buffer */
#define COMEDI_CB_ERROR 16 /* card error during acquisition */ #define COMEDI_CB_ERROR 16 /* card error during acquisition */
#define COMEDI_CB_OVERFLOW 32 /* buffer overflow/underflow */ #define COMEDI_CB_OVERFLOW 32 /* buffer overflow/underflow */
...@@ -499,8 +500,10 @@ ...@@ -499,8 +500,10 @@
I8254_MODE2 = (2 << 1), /* Rate generator */ I8254_MODE2 = (2 << 1), /* Rate generator */
I8254_MODE3 = (3 << 1), /* Square wave mode */ I8254_MODE3 = (3 << 1), /* Square wave mode */
I8254_MODE4 = (4 << 1), /* Software triggered strobe */ I8254_MODE4 = (4 << 1), /* Software triggered strobe */
I8254_MODE5 = (5 << 1), /* Hardware triggered strobe (retriggerable) */ I8254_MODE5 = (5 << 1), /* Hardware triggered strobe
I8254_BCD = 1, /* use binary-coded decimal instead of binary (pretty useless) */ * (retriggerable) */
I8254_BCD = 1, /* use binary-coded decimal instead of binary
* (pretty useless) */
I8254_BINARY = 0 I8254_BINARY = 0
}; };
...@@ -640,7 +643,8 @@ May be bitwise-or'd with CR_EDGE or CR_INVERT. */ ...@@ -640,7 +643,8 @@ May be bitwise-or'd with CR_EDGE or CR_INVERT. */
NI_GPCT_UP_DOWN_PIN_i_GATE_SELECT = 0x201, NI_GPCT_UP_DOWN_PIN_i_GATE_SELECT = 0x201,
NI_GPCT_SELECTED_GATE_GATE_SELECT = 0x21e, NI_GPCT_SELECTED_GATE_GATE_SELECT = 0x21e,
/* m-series "second gate" sources are unknown, /* m-series "second gate" sources are unknown,
we should add them here with an offset of 0x300 when known. */ * we should add them here with an offset of 0x300 when
* known. */
NI_GPCT_DISABLED_GATE_SELECT = 0x8000, NI_GPCT_DISABLED_GATE_SELECT = 0x8000,
}; };
static inline unsigned NI_GPCT_GATE_PIN_GATE_SELECT(unsigned n) static inline unsigned NI_GPCT_GATE_PIN_GATE_SELECT(unsigned n)
...@@ -681,14 +685,14 @@ INSN_CONFIG_SET_OTHER_SRC when using NI general-purpose counters. */ ...@@ -681,14 +685,14 @@ INSN_CONFIG_SET_OTHER_SRC when using NI general-purpose counters. */
INSN_CONFIG_ARM */ INSN_CONFIG_ARM */
enum ni_gpct_arm_source { enum ni_gpct_arm_source {
NI_GPCT_ARM_IMMEDIATE = 0x0, NI_GPCT_ARM_IMMEDIATE = 0x0,
NI_GPCT_ARM_PAIRED_IMMEDIATE = 0x1, /* Start both the counter and NI_GPCT_ARM_PAIRED_IMMEDIATE = 0x1, /* Start both the counter
the adjacent paired counter * and the adjacent paired
simultaneously */ * counter simultaneously */
/* NI doesn't document bits for selecting hardware arm triggers. If /* NI doesn't document bits for selecting hardware arm triggers.
* the NI_GPCT_ARM_UNKNOWN bit is set, we will pass the least * If the NI_GPCT_ARM_UNKNOWN bit is set, we will pass the least
* significant bits (3 bits for 660x or 5 bits for m-series) through to * significant bits (3 bits for 660x or 5 bits for m-series)
* the hardware. This will at least allow someone to figure out what * through to the hardware. This will at least allow someone to
* the bits do later. */ * figure out what the bits do later. */
NI_GPCT_ARM_UNKNOWN = 0x1000, NI_GPCT_ARM_UNKNOWN = 0x1000,
}; };
...@@ -740,8 +744,8 @@ INSN_CONFIG_ARM */ ...@@ -740,8 +744,8 @@ INSN_CONFIG_ARM */
NI_RTSI_OUTPUT_G_GATE0 = 6, NI_RTSI_OUTPUT_G_GATE0 = 6,
NI_RTSI_OUTPUT_RGOUT0 = 7, NI_RTSI_OUTPUT_RGOUT0 = 7,
NI_RTSI_OUTPUT_RTSI_BRD_0 = 8, NI_RTSI_OUTPUT_RTSI_BRD_0 = 8,
NI_RTSI_OUTPUT_RTSI_OSC = 12 /* pre-m-series always have RTSI clock NI_RTSI_OUTPUT_RTSI_OSC = 12 /* pre-m-series always have RTSI
on line 7 */ * clock on line 7 */
}; };
static inline unsigned NI_RTSI_OUTPUT_RTSI_BRD(unsigned n) static inline unsigned NI_RTSI_OUTPUT_RTSI_BRD(unsigned n)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment