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

staging: comedi: pcl711: convert driver to use the comedi_8254 module

Browse Source 
This driver uses an 8254 timer to generate the pacer clock used for analog
input data acquisition. Convert it to use the comedi_8254 module to provide
support for the 8254 timer.

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-02-23 14:57:33 -07:00 committed by Greg Kroah-Hartman
parent 18c284c68b
commit 9ef02dea59
2 changed files with 12 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/staging/comedi/Kconfig
View File

@ -108,6 +108,7 @@ if COMEDI_ISA_DRIVERS
config COMEDI_PCL711 config COMEDI_PCL711
tristate "Advantech PCL-711/711b and ADlink ACL-8112 ISA card support" tristate "Advantech PCL-711/711b and ADlink ACL-8112 ISA card support"
select COMEDI_8254
---help--- ---help---
Enable support for Advantech PCL-711 and 711b, ADlink ACL-8112 Enable support for Advantech PCL-711 and 711b, ADlink ACL-8112

42
drivers/staging/comedi/drivers/pcl711.c
View File

@ -42,7 +42,7 @@
#include "../comedidev.h" #include "../comedidev.h"
#include "comedi_fc.h" #include "comedi_fc.h"
#include "8253.h" #include "comedi_8254.h"
/* /*
* I/O port register map * I/O port register map
@ -153,11 +153,6 @@ static const struct pcl711_board boardtypes[] = {
}, },
}; };
struct pcl711_private {
unsigned int divisor1;
unsigned int divisor2;
};
static void pcl711_ai_set_mode(struct comedi_device *dev, unsigned int mode) static void pcl711_ai_set_mode(struct comedi_device *dev, unsigned int mode)
{ {
/* /*
@ -287,9 +282,7 @@ static int pcl711_ai_insn_read(struct comedi_device *dev,
static int pcl711_ai_cmdtest(struct comedi_device *dev, static int pcl711_ai_cmdtest(struct comedi_device *dev,
struct comedi_subdevice *s, struct comedi_cmd *cmd) struct comedi_subdevice *s, struct comedi_cmd *cmd)
{ {
struct pcl711_private *devpriv = dev->private;
int err = 0; int err = 0;
unsigned int arg;
/* Step 1 : check if triggers are trivially valid */ /* Step 1 : check if triggers are trivially valid */
@ -339,11 +332,9 @@ static int pcl711_ai_cmdtest(struct comedi_device *dev,
/* step 4 */ /* step 4 */
if (cmd->scan_begin_src == TRIG_TIMER) { if (cmd->scan_begin_src == TRIG_TIMER) {
arg = cmd->scan_begin_arg; unsigned int arg = cmd->scan_begin_arg;
i8253_cascade_ns_to_timer(I8254_OSC_BASE_2MHZ,
&devpriv->divisor1, comedi_8254_cascade_ns_to_timer(dev->pacer, &arg, cmd->flags);
&devpriv->divisor2,
&arg, cmd->flags);
err |= cfc_check_trigger_arg_is(&cmd->scan_begin_arg, arg); err |= cfc_check_trigger_arg_is(&cmd->scan_begin_arg, arg);
} }
@ -353,18 +344,6 @@ static int pcl711_ai_cmdtest(struct comedi_device *dev,
return 0; return 0;
} }
static void pcl711_ai_load_counters(struct comedi_device *dev)
{
struct pcl711_private *devpriv = dev->private;
unsigned long timer_base = dev->iobase + PCL711_TIMER_BASE;
i8254_set_mode(timer_base, 0, 1, I8254_MODE2 | I8254_BINARY);
i8254_set_mode(timer_base, 0, 2, I8254_MODE2 | I8254_BINARY);
i8254_write(timer_base, 0, 1, devpriv->divisor1);
i8254_write(timer_base, 0, 2, devpriv->divisor2);
}
static int pcl711_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) static int pcl711_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
{ {
struct comedi_cmd *cmd = &s->async->cmd; struct comedi_cmd *cmd = &s->async->cmd;
@ -372,7 +351,8 @@ static int pcl711_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
pcl711_set_changain(dev, s, cmd->chanlist[0]); pcl711_set_changain(dev, s, cmd->chanlist[0]);
if (cmd->scan_begin_src == TRIG_TIMER) { if (cmd->scan_begin_src == TRIG_TIMER) {
pcl711_ai_load_counters(dev); comedi_8254_update_divisors(dev->pacer);
comedi_8254_pacer_enable(dev->pacer, 1, 2, true);
outb(PCL711_INT_STAT_CLR, dev->iobase + PCL711_INT_STAT_REG); outb(PCL711_INT_STAT_CLR, dev->iobase + PCL711_INT_STAT_REG);
pcl711_ai_set_mode(dev, PCL711_MODE_PACER_IRQ); pcl711_ai_set_mode(dev, PCL711_MODE_PACER_IRQ);
} else { } else {
@ -445,14 +425,9 @@ static int pcl711_do_insn_bits(struct comedi_device *dev,
static int pcl711_attach(struct comedi_device *dev, struct comedi_devconfig *it) static int pcl711_attach(struct comedi_device *dev, struct comedi_devconfig *it)
{ {
const struct pcl711_board *board = dev->board_ptr; const struct pcl711_board *board = dev->board_ptr;
struct pcl711_private *devpriv;
struct comedi_subdevice *s; struct comedi_subdevice *s;
int ret; int ret;
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
if (!devpriv)
return -ENOMEM;
ret = comedi_request_region(dev, it->options[0], 0x10); ret = comedi_request_region(dev, it->options[0], 0x10);
if (ret) if (ret)
return ret; return ret;
@ -464,6 +439,11 @@ static int pcl711_attach(struct comedi_device *dev, struct comedi_devconfig *it)
dev->irq = it->options[1]; dev->irq = it->options[1];
} }
dev->pacer = comedi_8254_init(dev->iobase + PCL711_TIMER_BASE,
I8254_OSC_BASE_2MHZ, I8254_IO8, 0);
if (!dev->pacer)
return -ENOMEM;
ret = comedi_alloc_subdevices(dev, 4); ret = comedi_alloc_subdevices(dev, 4);
if (ret) if (ret)
return ret; return ret;