aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Rankilor <reodge@gmail.com>2010-05-13 06:28:38 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2010-05-14 16:51:52 -0400
commitb464f791caf66b6120c3cd8a77ad313ed532667a (patch)
tree43dc350c0a2a2328fe9dd33781a4ae4f23adedd3
parent6c7f81967b8984e6fb6b1f04c63f32d90a15c479 (diff)
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: Mark Rankilor <reodge@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/staging/comedi/comedi.h32
1 files changed, 18 insertions, 14 deletions
diff --git a/drivers/staging/comedi/comedi.h b/drivers/staging/comedi/comedi.h
index 1538146b37a3..3e3663fe1f4f 100644
--- a/drivers/staging/comedi/comedi.h
+++ b/drivers/staging/comedi/comedi.h
@@ -465,7 +465,8 @@
465 465
466#define COMEDI_CB_EOS 1 /* end of scan */ 466#define COMEDI_CB_EOS 1 /* end of scan */
467#define COMEDI_CB_EOA 2 /* end of acquisition */ 467#define COMEDI_CB_EOA 2 /* end of acquisition */
468#define COMEDI_CB_BLOCK 4 /* data has arrived: wakes up read() / write() */ 468#define COMEDI_CB_BLOCK 4 /* data has arrived:
469 * wakes up read() / write() */
469#define COMEDI_CB_EOBUF 8 /* DEPRECATED: end of buffer */ 470#define COMEDI_CB_EOBUF 8 /* DEPRECATED: end of buffer */
470#define COMEDI_CB_ERROR 16 /* card error during acquisition */ 471#define COMEDI_CB_ERROR 16 /* card error during acquisition */
471#define COMEDI_CB_OVERFLOW 32 /* buffer overflow/underflow */ 472#define COMEDI_CB_OVERFLOW 32 /* buffer overflow/underflow */
@@ -499,8 +500,10 @@
499 I8254_MODE2 = (2 << 1), /* Rate generator */ 500 I8254_MODE2 = (2 << 1), /* Rate generator */
500 I8254_MODE3 = (3 << 1), /* Square wave mode */ 501 I8254_MODE3 = (3 << 1), /* Square wave mode */
501 I8254_MODE4 = (4 << 1), /* Software triggered strobe */ 502 I8254_MODE4 = (4 << 1), /* Software triggered strobe */
502 I8254_MODE5 = (5 << 1), /* Hardware triggered strobe (retriggerable) */ 503 I8254_MODE5 = (5 << 1), /* Hardware triggered strobe
503 I8254_BCD = 1, /* use binary-coded decimal instead of binary (pretty useless) */ 504 * (retriggerable) */
505 I8254_BCD = 1, /* use binary-coded decimal instead of binary
506 * (pretty useless) */
504 I8254_BINARY = 0 507 I8254_BINARY = 0
505 }; 508 };
506 509
@@ -640,7 +643,8 @@ May be bitwise-or'd with CR_EDGE or CR_INVERT. */
640 NI_GPCT_UP_DOWN_PIN_i_GATE_SELECT = 0x201, 643 NI_GPCT_UP_DOWN_PIN_i_GATE_SELECT = 0x201,
641 NI_GPCT_SELECTED_GATE_GATE_SELECT = 0x21e, 644 NI_GPCT_SELECTED_GATE_GATE_SELECT = 0x21e,
642 /* m-series "second gate" sources are unknown, 645 /* m-series "second gate" sources are unknown,
643 we should add them here with an offset of 0x300 when known. */ 646 * we should add them here with an offset of 0x300 when
647 * known. */
644 NI_GPCT_DISABLED_GATE_SELECT = 0x8000, 648 NI_GPCT_DISABLED_GATE_SELECT = 0x8000,
645 }; 649 };
646 static inline unsigned NI_GPCT_GATE_PIN_GATE_SELECT(unsigned n) 650 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. */
681INSN_CONFIG_ARM */ 685INSN_CONFIG_ARM */
682 enum ni_gpct_arm_source { 686 enum ni_gpct_arm_source {
683 NI_GPCT_ARM_IMMEDIATE = 0x0, 687 NI_GPCT_ARM_IMMEDIATE = 0x0,
684 NI_GPCT_ARM_PAIRED_IMMEDIATE = 0x1, /* Start both the counter and 688 NI_GPCT_ARM_PAIRED_IMMEDIATE = 0x1, /* Start both the counter
685 the adjacent paired counter 689 * and the adjacent paired
686 simultaneously */ 690 * counter simultaneously */
687 /* NI doesn't document bits for selecting hardware arm triggers. If 691 /* NI doesn't document bits for selecting hardware arm triggers.
688 * the NI_GPCT_ARM_UNKNOWN bit is set, we will pass the least 692 * If the NI_GPCT_ARM_UNKNOWN bit is set, we will pass the least
689 * significant bits (3 bits for 660x or 5 bits for m-series) through to 693 * significant bits (3 bits for 660x or 5 bits for m-series)
690 * the hardware. This will at least allow someone to figure out what 694 * through to the hardware. This will at least allow someone to
691 * the bits do later. */ 695 * figure out what the bits do later. */
692 NI_GPCT_ARM_UNKNOWN = 0x1000, 696 NI_GPCT_ARM_UNKNOWN = 0x1000,
693 }; 697 };
694 698
@@ -740,8 +744,8 @@ INSN_CONFIG_ARM */
740 NI_RTSI_OUTPUT_G_GATE0 = 6, 744 NI_RTSI_OUTPUT_G_GATE0 = 6,
741 NI_RTSI_OUTPUT_RGOUT0 = 7, 745 NI_RTSI_OUTPUT_RGOUT0 = 7,
742 NI_RTSI_OUTPUT_RTSI_BRD_0 = 8, 746 NI_RTSI_OUTPUT_RTSI_BRD_0 = 8,
743 NI_RTSI_OUTPUT_RTSI_OSC = 12 /* pre-m-series always have RTSI clock 747 NI_RTSI_OUTPUT_RTSI_OSC = 12 /* pre-m-series always have RTSI
744 on line 7 */ 748 * clock on line 7 */
745 }; 749 };
746 static inline unsigned NI_RTSI_OUTPUT_RTSI_BRD(unsigned n) 750 static inline unsigned NI_RTSI_OUTPUT_RTSI_BRD(unsigned n)
747 { 751 {