leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: comedi: c6xdigio: define the data register bits

Browse Source 
To clarify the code, define the bits in the data register and remove the
magic numbers.

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 2014-03-10 14:07:35 -07:00 committed by Greg Kroah-Hartman
parent 19d0a87284
commit 28c2c50c72
1 changed files with 19 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
drivers/staging/comedi/drivers/c6xdigio.c
View File

@ -47,6 +47,9 @@ http://robot0.ge.uiuc.edu/~spong/mecha/
* Register I/O map
*/
#define C6XDIGIO_DATA_REG 0x00
#define C6XDIGIO_DATA_CHAN(x) (((x) + 1) << 4)
#define C6XDIGIO_DATA_PWM (1 << 5)
#define C6XDIGIO_DATA_ENCODER (1 << 6)
#define C6XDIGIO_STATUS_REG 0x01
#define C6XDIGIO_CTRL_REG 0x02
@ -101,13 +104,8 @@ static void c6xdigio_pwm_init(struct comedi_device *dev)
static void c6xdigio_pwm_write(struct comedi_device *dev,
unsigned int chan, unsigned int val)
{
unsigned int cmd = C6XDIGIO_DATA_PWM | C6XDIGIO_DATA_CHAN(chan);
unsigned int bits;
unsigned ppcmd;
if (chan == 0)
ppcmd = 0x28;
else
ppcmd = 0x30;
if (val > 498)
val = 498;
@ -115,15 +113,15 @@ static void c6xdigio_pwm_write(struct comedi_device *dev,
val = 2;
bits = (val >> 0) & 0x03;
c6xdigio_write_data(dev, ppcmd + bits, 0x00);
c6xdigio_write_data(dev, cmd | bits | (0 << 2), 0x00);
bits = (val >> 2) & 0x03;
c6xdigio_write_data(dev, ppcmd + bits + 0x4, 0x80);
c6xdigio_write_data(dev, cmd | bits | (1 << 2), 0x80);
bits = (val >> 4) & 0x03;
c6xdigio_write_data(dev, ppcmd + bits, 0x00);
c6xdigio_write_data(dev, cmd | bits | (0 << 2), 0x00);
bits = (val >> 6) & 0x03;
c6xdigio_write_data(dev, ppcmd + bits + 0x4, 0x80);
c6xdigio_write_data(dev, cmd | bits | (1 << 2), 0x80);
bits = (val >> 8) & 0x03;
c6xdigio_write_data(dev, ppcmd + bits, 0x00);
c6xdigio_write_data(dev, cmd | bits | (0 << 2), 0x00);
c6xdigio_write_data(dev, 0x00, 0x80);
}
@ -131,39 +129,34 @@ static void c6xdigio_pwm_write(struct comedi_device *dev,
static int c6xdigio_encoder_read(struct comedi_device *dev,
unsigned int chan)
{
unsigned int cmd = C6XDIGIO_DATA_ENCODER | C6XDIGIO_DATA_CHAN(chan);
unsigned int val = 0;
unsigned int bits;
unsigned ppcmd;
if (chan == 0)
ppcmd = 0x48;
else
ppcmd = 0x50;
c6xdigio_write_data(dev, cmd, 0x00);
c6xdigio_write_data(dev, ppcmd, 0x00);
c6xdigio_get_encoder_bits(dev, &bits, ppcmd + 0x04, 0x80);
c6xdigio_get_encoder_bits(dev, &bits, cmd | (1 << 2), 0x80);
val |= (bits << 0);
c6xdigio_get_encoder_bits(dev, &bits, ppcmd, 0x00);
c6xdigio_get_encoder_bits(dev, &bits, cmd | (0 << 2), 0x00);
val |= (bits << 3);
c6xdigio_get_encoder_bits(dev, &bits, ppcmd + 0x04, 0x80);
c6xdigio_get_encoder_bits(dev, &bits, cmd | (1 << 2), 0x80);
val |= (bits << 6);
c6xdigio_get_encoder_bits(dev, &bits, ppcmd, 0x00);
c6xdigio_get_encoder_bits(dev, &bits, cmd | (0 << 2), 0x00);
val |= (bits << 9);
c6xdigio_get_encoder_bits(dev, &bits, ppcmd + 0x04, 0x80);
c6xdigio_get_encoder_bits(dev, &bits, cmd | (1 << 2), 0x80);
val |= (bits << 12);
c6xdigio_get_encoder_bits(dev, &bits, ppcmd, 0x00);
c6xdigio_get_encoder_bits(dev, &bits, cmd | (0 << 2), 0x00);
val |= (bits << 15);
c6xdigio_get_encoder_bits(dev, &bits, ppcmd + 0x04, 0x80);
c6xdigio_get_encoder_bits(dev, &bits, cmd | (1 << 2), 0x80);
val |= (bits << 18);
c6xdigio_get_encoder_bits(dev, &bits, ppcmd, 0x00);
c6xdigio_get_encoder_bits(dev, &bits, cmd | (0 << 2), 0x00);
val |= (bits << 21);
c6xdigio_write_data(dev, 0x00, 0x80);