openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: comedi: hwdrv_apci1564: remove magic numbers in apci1564_counter_insn_read() 

Use the bit defines from addi_tcw.h to remove the magic numbers in this
function.

Add the missing define for ADDI_TCW_STATUS_HARDWARE_TRIG.

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>
This commit is contained in:
H Hartley Sweeten 2015-08-07 11:45:14 -07:00 committed by Greg Kroah-Hartman
parent c6288a3beb
commit 5babc1bc4d
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c
View File

@ -178,10 +178,10 @@ static int apci1564_counter_insn_read(struct comedi_device *dev,
data[0] = inl(iobase + ADDI_TCW_VAL_REG);
status = inl(iobase + ADDI_TCW_STATUS_REG);
data[1] = (status >> 1) & 1; /* software trigger status */
data[2] = (status >> 2) & 1; /* hardware trigger status */
data[3] = (status >> 3) & 1; /* software clear status */
data[4] = (status >> 0) & 1; /* overflow status */
data[1] = (status & ADDI_TCW_STATUS_SOFT_TRIG) ? 1 : 0;
data[2] = (status & ADDI_TCW_STATUS_HARDWARE_TRIG) ? 1 : 0;
data[3] = (status & ADDI_TCW_STATUS_SOFT_CLR) ? 1 : 0;
data[4] = (status & ADDI_TCW_STATUS_OVERFLOW) ? 1 : 0;
return insn->n;
}

1
drivers/staging/comedi/drivers/addi_tcw.h
View File

@ -49,6 +49,7 @@
#define ADDI_TCW_STATUS_REG 0x10
#define ADDI_TCW_STATUS_SOFT_CLR BIT(3)
#define ADDI_TCW_STATUS_HARDWARE_TRIG BIT(2)
#define ADDI_TCW_STATUS_SOFT_TRIG BIT(1)
#define ADDI_TCW_STATUS_OVERFLOW BIT(0)