diff options
author | W. Trevor King <wking@tremily.us> | 2012-04-18 21:30:27 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-20 11:29:54 -0400 |
commit | 35c81aaa56e3e1a8eb8f86837889ed979085b1bc (patch) | |
tree | 9bbba997185496cf6b332d7467b79cfef10af686 | |
parent | b0d5c7988461e531b25d484438fd7c52cf1c3f45 (diff) |
staging: comedi: ni_tio_internal.h: checkpatch.pl line wrapping
Signed-off-by: W. Trevor King <wking@tremily.us>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/staging/comedi/drivers/ni_tio_internal.h | 31 |
1 files changed, 20 insertions, 11 deletions
diff --git a/drivers/staging/comedi/drivers/ni_tio_internal.h b/drivers/staging/comedi/drivers/ni_tio_internal.h index c4ca53785832..f9295ec25e70 100644 --- a/drivers/staging/comedi/drivers/ni_tio_internal.h +++ b/drivers/staging/comedi/drivers/ni_tio_internal.h | |||
@@ -362,8 +362,8 @@ static inline enum ni_gpct_register NITIO_Gi_ABZ_Reg(int counter_index) | |||
362 | return 0; | 362 | return 0; |
363 | } | 363 | } |
364 | 364 | ||
365 | static inline enum ni_gpct_register NITIO_Gi_Interrupt_Acknowledge_Reg(int | 365 | static inline enum ni_gpct_register NITIO_Gi_Interrupt_Acknowledge_Reg( |
366 | counter_index) | 366 | int counter_index) |
367 | { | 367 | { |
368 | switch (counter_index) { | 368 | switch (counter_index) { |
369 | case 0: | 369 | case 0: |
@@ -407,8 +407,8 @@ static inline enum ni_gpct_register NITIO_Gi_Status_Reg(int counter_index) | |||
407 | return 0; | 407 | return 0; |
408 | } | 408 | } |
409 | 409 | ||
410 | static inline enum ni_gpct_register NITIO_Gi_Interrupt_Enable_Reg(int | 410 | static inline enum ni_gpct_register NITIO_Gi_Interrupt_Enable_Reg( |
411 | counter_index) | 411 | int counter_index) |
412 | { | 412 | { |
413 | switch (counter_index) { | 413 | switch (counter_index) { |
414 | case 0: | 414 | case 0: |
@@ -472,15 +472,22 @@ enum Gi_Counting_Mode_Reg_Bits { | |||
472 | Gi_Index_Phase_LowA_HighB = 0x1 << Gi_Index_Phase_Bitshift, | 472 | Gi_Index_Phase_LowA_HighB = 0x1 << Gi_Index_Phase_Bitshift, |
473 | Gi_Index_Phase_HighA_LowB = 0x2 << Gi_Index_Phase_Bitshift, | 473 | Gi_Index_Phase_HighA_LowB = 0x2 << Gi_Index_Phase_Bitshift, |
474 | Gi_Index_Phase_HighA_HighB = 0x3 << Gi_Index_Phase_Bitshift, | 474 | Gi_Index_Phase_HighA_HighB = 0x3 << Gi_Index_Phase_Bitshift, |
475 | Gi_HW_Arm_Enable_Bit = 0x80, /* from m-series example code, not documented in 660x register level manual */ | 475 | /* from m-series example code, not documented in 660x register level |
476 | Gi_660x_HW_Arm_Select_Mask = 0x7 << Gi_HW_Arm_Select_Shift, /* from m-series example code, not documented in 660x register level manual */ | 476 | * manual */ |
477 | Gi_HW_Arm_Enable_Bit = 0x80, | ||
478 | /* from m-series example code, not documented in 660x register level | ||
479 | * manual */ | ||
480 | Gi_660x_HW_Arm_Select_Mask = 0x7 << Gi_HW_Arm_Select_Shift, | ||
477 | Gi_660x_Prescale_X8_Bit = 0x1000, | 481 | Gi_660x_Prescale_X8_Bit = 0x1000, |
478 | Gi_M_Series_Prescale_X8_Bit = 0x2000, | 482 | Gi_M_Series_Prescale_X8_Bit = 0x2000, |
479 | Gi_M_Series_HW_Arm_Select_Mask = 0x1f << Gi_HW_Arm_Select_Shift, | 483 | Gi_M_Series_HW_Arm_Select_Mask = 0x1f << Gi_HW_Arm_Select_Shift, |
480 | /* must be set for clocks over 40MHz, which includes synchronous counting and quadrature modes */ | 484 | /* must be set for clocks over 40MHz, which includes synchronous |
485 | * counting and quadrature modes */ | ||
481 | Gi_660x_Alternate_Sync_Bit = 0x2000, | 486 | Gi_660x_Alternate_Sync_Bit = 0x2000, |
482 | Gi_M_Series_Alternate_Sync_Bit = 0x4000, | 487 | Gi_M_Series_Alternate_Sync_Bit = 0x4000, |
483 | Gi_660x_Prescale_X2_Bit = 0x4000, /* from m-series example code, not documented in 660x register level manual */ | 488 | /* from m-series example code, not documented in 660x register level |
489 | * manual */ | ||
490 | Gi_660x_Prescale_X2_Bit = 0x4000, | ||
484 | Gi_M_Series_Prescale_X2_Bit = 0x8000, | 491 | Gi_M_Series_Prescale_X2_Bit = 0x8000, |
485 | }; | 492 | }; |
486 | 493 | ||
@@ -503,7 +510,8 @@ enum Gi_Mode_Bits { | |||
503 | Gi_Level_Gating_Bits = 0x1, | 510 | Gi_Level_Gating_Bits = 0x1, |
504 | Gi_Rising_Edge_Gating_Bits = 0x2, | 511 | Gi_Rising_Edge_Gating_Bits = 0x2, |
505 | Gi_Falling_Edge_Gating_Bits = 0x3, | 512 | Gi_Falling_Edge_Gating_Bits = 0x3, |
506 | Gi_Gate_On_Both_Edges_Bit = 0x4, /* used in conjunction with rising edge gating mode */ | 513 | Gi_Gate_On_Both_Edges_Bit = 0x4, /* used in conjunction with |
514 | * rising edge gating mode */ | ||
507 | Gi_Trigger_Mode_for_Edge_Gate_Mask = 0x18, | 515 | Gi_Trigger_Mode_for_Edge_Gate_Mask = 0x18, |
508 | Gi_Edge_Gate_Starts_Stops_Bits = 0x0, | 516 | Gi_Edge_Gate_Starts_Stops_Bits = 0x0, |
509 | Gi_Edge_Gate_Stops_Starts_Bits = 0x8, | 517 | Gi_Edge_Gate_Stops_Starts_Bits = 0x8, |
@@ -748,8 +756,9 @@ static inline void ni_tio_set_bits_transient(struct ni_gpct *counter, | |||
748 | } | 756 | } |
749 | 757 | ||
750 | /* ni_tio_set_bits( ) is for safely writing to registers whose bits may be | 758 | /* ni_tio_set_bits( ) is for safely writing to registers whose bits may be |
751 | twiddled in interrupt context, or whose software copy may be read in interrupt context. | 759 | * twiddled in interrupt context, or whose software copy may be read in |
752 | */ | 760 | * interrupt context. |
761 | */ | ||
753 | static inline void ni_tio_set_bits(struct ni_gpct *counter, | 762 | static inline void ni_tio_set_bits(struct ni_gpct *counter, |
754 | enum ni_gpct_register register_index, | 763 | enum ni_gpct_register register_index, |
755 | unsigned bit_mask, unsigned bit_values) | 764 | unsigned bit_mask, unsigned bit_values) |