Skip to content

L
linux
Commit 5a5614cb authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files
Options

staging: comedi: s526: cleanup s526_gpct_insn_config() 

Use a local variable for the iobase of the channel being configured.
This makes the outw() calls a bit cleaner.

Remove the unnecessary casting of the values being written to
the channel registers.
Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2a29edf6
Hide whitespace changes
Inline Side-by-side
Showing with 55 additions and 53 deletions
drivers/staging/comedi/drivers/s526.c
View file @ 5a5614cb
...@@ -168,12 +168,14 @@ static int s526_gpct_rinsn(struct comedi_device *dev, ...@@ -168,12 +168,14 @@ static int s526_gpct_rinsn(struct comedi_device *dev,
static int s526_gpct_insn_config(struct comedi_device *dev, static int s526_gpct_insn_config(struct comedi_device *dev,
struct comedi_subdevice *s, struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data) struct comedi_insn *insn,
unsigned int *data)
{ {
struct s526_private *devpriv = dev->private; struct s526_private *devpriv = dev->private;
unsigned int chan = CR_CHAN(insn->chanspec); unsigned int chan = CR_CHAN(insn->chanspec);
unsigned long chan_iobase = dev->iobase + chan * 8;
unsigned int val;
int i; int i;
short value;
union cmReg cmReg; union cmReg cmReg;
for (i = 0; i < MAX_GPCT_CONFIG_DATA; i++) for (i = 0; i < MAX_GPCT_CONFIG_DATA; i++)
...@@ -206,32 +208,32 @@ static int s526_gpct_insn_config(struct comedi_device *dev, ...@@ -206,32 +208,32 @@ static int s526_gpct_insn_config(struct comedi_device *dev,
cmReg.reg.preloadRegSel = 0; /* PR0 */ cmReg.reg.preloadRegSel = 0; /* PR0 */
cmReg.reg.reserved = 0; cmReg.reg.reserved = 0;
outw(cmReg.value, dev->iobase + REG_C0M + chan * 8); outw(cmReg.value, chan_iobase + REG_C0M);
outw(0x0001, dev->iobase + REG_C0H + chan * 8); outw(0x0001, chan_iobase + REG_C0H);
outw(0x3C68, dev->iobase + REG_C0L + chan * 8); outw(0x3C68, chan_iobase + REG_C0L);
/* Reset the counter */ /* Reset the counter */
outw(0x8000, dev->iobase + REG_C0C + chan * 8); outw(0x8000, chan_iobase + REG_C0C);
/* Load the counter from PR0 */ /* Load the counter from PR0 */
outw(0x4000, dev->iobase + REG_C0C + chan * 8); outw(0x4000, chan_iobase + REG_C0C);
/* Reset RCAP (fires one-shot) */ /* Reset RCAP (fires one-shot) */
outw(0x0008, dev->iobase + REG_C0C + chan * 8); outw(0x0008, chan_iobase + REG_C0C);
#endif #endif
#if 1 #if 1
/* Set Counter Mode Register */ /* Set Counter Mode Register */
cmReg.value = data[1] & 0xFFFF; cmReg.value = data[1] & 0xffff;
outw(cmReg.value, dev->iobase + REG_C0M + chan * 8); outw(cmReg.value, chan_iobase + REG_C0M);
/* Reset the counter if it is software preload */ /* Reset the counter if it is software preload */
if (cmReg.reg.autoLoadResetRcap == 0) { if (cmReg.reg.autoLoadResetRcap == 0) {
/* Reset the counter */ /* Reset the counter */
outw(0x8000, dev->iobase + REG_C0C + chan * 8); outw(0x8000, chan_iobase + REG_C0C);
/* Load the counter from PR0 /* Load the counter from PR0
* outw(0x4000, dev->iobase + REG_C0C + chan * 8); * outw(0x4000, chan_iobase + REG_C0C);
*/ */
} }
#else #else
...@@ -258,28 +260,28 @@ static int s526_gpct_insn_config(struct comedi_device *dev, ...@@ -258,28 +260,28 @@ static int s526_gpct_insn_config(struct comedi_device *dev,
cmReg.reg.autoLoadResetRcap = 4; cmReg.reg.autoLoadResetRcap = 4;
/* Set Counter Mode Register */ /* Set Counter Mode Register */
cmReg.value = (short)(data[1] & 0xFFFF); cmReg.value = data[1] & 0xffff;
outw(cmReg.value, dev->iobase + REG_C0M + chan * 8); outw(cmReg.value, chan_iobase + REG_C0M);
/* Load the pre-load register high word */ /* Load the pre-load register high word */
value = (short)((data[2] >> 16) & 0xFFFF); val = (data[2] >> 16) & 0xffff;
outw(value, dev->iobase + REG_C0H + chan * 8); outw(val, chan_iobase + REG_C0H);
/* Load the pre-load register low word */ /* Load the pre-load register low word */
value = (short)(data[2] & 0xFFFF); val = data[2] & 0xffff;
outw(value, dev->iobase + REG_C0L + chan * 8); outw(val, chan_iobase + REG_C0L);
/* Write the Counter Control Register */ /* Write the Counter Control Register */
if (data[3] != 0) { if (data[3]) {
value = (short)(data[3] & 0xFFFF); val = data[3] & 0xffff;
outw(value, dev->iobase + REG_C0C + chan * 8); outw(val, chan_iobase + REG_C0C);
} }
/* Reset the counter if it is software preload */ /* Reset the counter if it is software preload */
if (cmReg.reg.autoLoadResetRcap == 0) { if (cmReg.reg.autoLoadResetRcap == 0) {
/* Reset the counter */ /* Reset the counter */
outw(0x8000, dev->iobase + REG_C0C + chan * 8); outw(0x8000, chan_iobase + REG_C0C);
/* Load the counter from PR0 */ /* Load the counter from PR0 */
outw(0x4000, dev->iobase + REG_C0C + chan * 8); outw(0x4000, chan_iobase + REG_C0C);
} }
#endif #endif
break; break;
...@@ -295,35 +297,35 @@ static int s526_gpct_insn_config(struct comedi_device *dev, ...@@ -295,35 +297,35 @@ static int s526_gpct_insn_config(struct comedi_device *dev,
devpriv->s526_gpct_config[chan].app = SinglePulseGeneration; devpriv->s526_gpct_config[chan].app = SinglePulseGeneration;
/* Set Counter Mode Register */ /* Set Counter Mode Register */
cmReg.value = (short)(data[1] & 0xFFFF); cmReg.value = data[1] & 0xffff;
cmReg.reg.preloadRegSel = 0; /* PR0 */ cmReg.reg.preloadRegSel = 0; /* PR0 */
outw(cmReg.value, dev->iobase + REG_C0M + chan * 8); outw(cmReg.value, chan_iobase + REG_C0M);
/* Load the pre-load register 0 high word */ /* Load the pre-load register 0 high word */
value = (short)((data[2] >> 16) & 0xFFFF); val = (data[2] >> 16) & 0xffff;
outw(value, dev->iobase + REG_C0H + chan * 8); outw(val, chan_iobase + REG_C0H);
/* Load the pre-load register 0 low word */ /* Load the pre-load register 0 low word */
value = (short)(data[2] & 0xFFFF); val = data[2] & 0xffff;
outw(value, dev->iobase + REG_C0L + chan * 8); outw(val, chan_iobase + REG_C0L);
/* Set Counter Mode Register */ /* Set Counter Mode Register */
cmReg.value = (short)(data[1] & 0xFFFF); cmReg.value = data[1] & 0xffff;
cmReg.reg.preloadRegSel = 1; /* PR1 */ cmReg.reg.preloadRegSel = 1; /* PR1 */
outw(cmReg.value, dev->iobase + REG_C0M + chan * 8); outw(cmReg.value, chan_iobase + REG_C0M);
/* Load the pre-load register 1 high word */ /* Load the pre-load register 1 high word */
value = (short)((data[3] >> 16) & 0xFFFF); val = (data[3] >> 16) & 0xffff;
outw(value, dev->iobase + REG_C0H + chan * 8); outw(val, chan_iobase + REG_C0H);
/* Load the pre-load register 1 low word */ /* Load the pre-load register 1 low word */
value = (short)(data[3] & 0xFFFF); val = data[3] & 0xffff;
outw(value, dev->iobase + REG_C0L + chan * 8); outw(val, chan_iobase + REG_C0L);
/* Write the Counter Control Register */ /* Write the Counter Control Register */
if (data[4] != 0) { if (data[4]) {
value = (short)(data[4] & 0xFFFF); val = data[4] & 0xffff;
outw(value, dev->iobase + REG_C0C + chan * 8); outw(val, chan_iobase + REG_C0C);
} }
break; break;
...@@ -338,35 +340,35 @@ static int s526_gpct_insn_config(struct comedi_device *dev, ...@@ -338,35 +340,35 @@ static int s526_gpct_insn_config(struct comedi_device *dev,
devpriv->s526_gpct_config[chan].app = PulseTrainGeneration; devpriv->s526_gpct_config[chan].app = PulseTrainGeneration;
/* Set Counter Mode Register */ /* Set Counter Mode Register */
cmReg.value = (short)(data[1] & 0xFFFF); cmReg.value = data[1] & 0xffff;
cmReg.reg.preloadRegSel = 0; /* PR0 */ cmReg.reg.preloadRegSel = 0; /* PR0 */
outw(cmReg.value, dev->iobase + REG_C0M + chan * 8); outw(cmReg.value, chan_iobase + REG_C0M);
/* Load the pre-load register 0 high word */ /* Load the pre-load register 0 high word */
value = (short)((data[2] >> 16) & 0xFFFF); val = (data[2] >> 16) & 0xffff;
outw(value, dev->iobase + REG_C0H + chan * 8); outw(val, chan_iobase + REG_C0H);
/* Load the pre-load register 0 low word */ /* Load the pre-load register 0 low word */
value = (short)(data[2] & 0xFFFF); val = data[2] & 0xffff;
outw(value, dev->iobase + REG_C0L + chan * 8); outw(val, chan_iobase + REG_C0L);
/* Set Counter Mode Register */ /* Set Counter Mode Register */
cmReg.value = (short)(data[1] & 0xFFFF); cmReg.value = data[1] & 0xffff;
cmReg.reg.preloadRegSel = 1; /* PR1 */ cmReg.reg.preloadRegSel = 1; /* PR1 */
outw(cmReg.value, dev->iobase + REG_C0M + chan * 8); outw(cmReg.value, chan_iobase + REG_C0M);
/* Load the pre-load register 1 high word */ /* Load the pre-load register 1 high word */
value = (short)((data[3] >> 16) & 0xFFFF); val = (data[3] >> 16) & 0xffff;
outw(value, dev->iobase + REG_C0H + chan * 8); outw(val, chan_iobase + REG_C0H);
/* Load the pre-load register 1 low word */ /* Load the pre-load register 1 low word */
value = (short)(data[3] & 0xFFFF); val = data[3] & 0xffff;
outw(value, dev->iobase + REG_C0L + chan * 8); outw(val, chan_iobase + REG_C0L);
/* Write the Counter Control Register */ /* Write the Counter Control Register */
if (data[4] != 0) { if (data[4]) {
value = (short)(data[4] & 0xFFFF); val = data[4] & 0xffff;
outw(value, dev->iobase + REG_C0C + chan * 8); outw(val, chan_iobase + REG_C0C);
} }
break; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7