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

staging: comedi: c6xdigio: tidy up C6X_encInput()

Browse Source 
Rename the CamelCase function.

For aesthetics, pass the comedi_device pointer instead of the dev->iobase
as the first parameter.

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:29 -07:00 committed by Greg Kroah-Hartman
parent c774049adb
commit 375a02810c
1 changed files with 33 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -143,54 +143,55 @@ static void c6xdigio_pwm_write(struct comedi_device *dev,
c6xdigio_chk_status(dev->iobase, 0x80);
}
static int C6X_encInput(unsigned long baseAddr, unsigned channel)
static int c6xdigio_encoder_read(struct comedi_device *dev,
unsigned int chan)
{
unsigned ppcmd;
union encvaluetype enc;
enc.value = 0;
if (channel == 0)
if (chan == 0)
ppcmd = 0x48;
else
ppcmd = 0x50;
outb_p(ppcmd, baseAddr);
c6xdigio_chk_status(baseAddr, 0x00);
outb_p(ppcmd, dev->iobase);
c6xdigio_chk_status(dev->iobase, 0x00);
enc.bits.sb0 = ((inb(baseAddr + 1) >> 3) & 0x7);
outb_p(ppcmd + 0x4, baseAddr);
c6xdigio_chk_status(baseAddr, 0x80);
enc.bits.sb0 = ((inb(dev->iobase + 1) >> 3) & 0x7);
outb_p(ppcmd + 0x4, dev->iobase);
c6xdigio_chk_status(dev->iobase, 0x80);
enc.bits.sb1 = ((inb(baseAddr + 1) >> 3) & 0x7);
outb_p(ppcmd, baseAddr);
c6xdigio_chk_status(baseAddr, 0x00);
enc.bits.sb1 = ((inb(dev->iobase + 1) >> 3) & 0x7);
outb_p(ppcmd, dev->iobase);
c6xdigio_chk_status(dev->iobase, 0x00);
enc.bits.sb2 = ((inb(baseAddr + 1) >> 3) & 0x7);
outb_p(ppcmd + 0x4, baseAddr);
c6xdigio_chk_status(baseAddr, 0x80);
enc.bits.sb2 = ((inb(dev->iobase + 1) >> 3) & 0x7);
outb_p(ppcmd + 0x4, dev->iobase);
c6xdigio_chk_status(dev->iobase, 0x80);
enc.bits.sb3 = ((inb(baseAddr + 1) >> 3) & 0x7);
outb_p(ppcmd, baseAddr);
c6xdigio_chk_status(baseAddr, 0x00);
enc.bits.sb3 = ((inb(dev->iobase + 1) >> 3) & 0x7);
outb_p(ppcmd, dev->iobase);
c6xdigio_chk_status(dev->iobase, 0x00);
enc.bits.sb4 = ((inb(baseAddr + 1) >> 3) & 0x7);
outb_p(ppcmd + 0x4, baseAddr);
c6xdigio_chk_status(baseAddr, 0x80);
enc.bits.sb4 = ((inb(dev->iobase + 1) >> 3) & 0x7);
outb_p(ppcmd + 0x4, dev->iobase);
c6xdigio_chk_status(dev->iobase, 0x80);
enc.bits.sb5 = ((inb(baseAddr + 1) >> 3) & 0x7);
outb_p(ppcmd, baseAddr);
c6xdigio_chk_status(baseAddr, 0x00);
enc.bits.sb5 = ((inb(dev->iobase + 1) >> 3) & 0x7);
outb_p(ppcmd, dev->iobase);
c6xdigio_chk_status(dev->iobase, 0x00);
enc.bits.sb6 = ((inb(baseAddr + 1) >> 3) & 0x7);
outb_p(ppcmd + 0x4, baseAddr);
c6xdigio_chk_status(baseAddr, 0x80);
enc.bits.sb6 = ((inb(dev->iobase + 1) >> 3) & 0x7);
outb_p(ppcmd + 0x4, dev->iobase);
c6xdigio_chk_status(dev->iobase, 0x80);
enc.bits.sb7 = ((inb(baseAddr + 1) >> 3) & 0x7);
outb_p(ppcmd, baseAddr);
c6xdigio_chk_status(baseAddr, 0x00);
enc.bits.sb7 = ((inb(dev->iobase + 1) >> 3) & 0x7);
outb_p(ppcmd, dev->iobase);
c6xdigio_chk_status(dev->iobase, 0x00);
outb_p(0x0, baseAddr);
c6xdigio_chk_status(baseAddr, 0x80);
outb_p(0x0, dev->iobase);
c6xdigio_chk_status(dev->iobase, 0x80);
return enc.value ^ 0x800000;
}
@ -229,11 +230,11 @@ static int c6xdigio_ei_insn_read(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data)
{
unsigned int chan = CR_CHAN(insn->chanspec);
int n;
int chan = CR_CHAN(insn->chanspec);
for (n = 0; n < insn->n; n++)
data[n] = (C6X_encInput(dev->iobase, chan) & 0xffffff);
data[n] = (c6xdigio_encoder_read(dev, chan) & 0xffffff);
return n;
}