diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2014-07-28 10:26:53 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-30 16:50:59 -0700 |
| commit | 24a675c5130198fcf354325f108b4a62aa7575a5 (patch) | |
| tree | 658985310213e65bf5ae21e1b9464dacff413000 /drivers/staging/comedi/drivers/ni_tiocmd.c | |
| parent | 4359dcf3564500e37e5da4eba7b4bd7f1847096b (diff) | |
staging: comedi: ni_tio: tidy up Gxx_Status_Bits
Convert this enum into defines and rename the CamelCase symbols.
For aesthetics, move the new defines so they are associated with
the register define.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/comedi/drivers/ni_tiocmd.c')
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_tiocmd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/comedi/drivers/ni_tiocmd.c b/drivers/staging/comedi/drivers/ni_tiocmd.c index 16dba7fe7797..d628748ac513 100644 --- a/drivers/staging/comedi/drivers/ni_tiocmd.c +++ b/drivers/staging/comedi/drivers/ni_tiocmd.c @@ -377,7 +377,7 @@ void ni_tio_acknowledge_and_confirm(struct ni_gpct *counter, int *gate_error, if (stale_data) *stale_data = 0; - if (gxx_status & Gi_Gate_Error_Bit(cidx)) { + if (gxx_status & GI_GATE_ERROR(cidx)) { ack |= Gi_Gate_Error_Confirm_Bit(cidx); if (gate_error) { /*660x don't support automatic acknowledgement @@ -389,7 +389,7 @@ void ni_tio_acknowledge_and_confirm(struct ni_gpct *counter, int *gate_error, } } } - if (gxx_status & Gi_TC_Error_Bit(cidx)) { + if (gxx_status & GI_TC_ERROR(cidx)) { ack |= Gi_TC_Error_Confirm_Bit(cidx); if (tc_error) *tc_error = 1; @@ -404,7 +404,7 @@ void ni_tio_acknowledge_and_confirm(struct ni_gpct *counter, int *gate_error, write_register(counter, ack, NITIO_INT_ACK_REG(cidx)); if (ni_tio_get_soft_copy(counter, NITIO_MODE_REG(cidx)) & GI_LOADING_ON_GATE) { - if (gxx_status & Gi_Stale_Data_Bit(cidx)) { + if (gxx_status & GI_STALE_DATA(cidx)) { if (stale_data) *stale_data = 1; } |