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

Staging: comedi: pcl818: Fix option handling for FIFO mode (hopefully!).

Browse Source 
Signed-off-by: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Ian Abbott 2009-04-14 10:33:42 -04:00 committed by Greg Kroah-Hartman
parent 6a2436e484
commit a71f18d2a1
1 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
drivers/staging/comedi/drivers/pcl818.c
View File

@ -1025,26 +1025,32 @@ static int pcl818_ai_cmd_mode(int mode, struct comedi_device * dev,
}
#endif
break;
case 0: /* IRQ */
/* rt_printk("IRQ\n"); */
if (mode == 1) {
devpriv->ai_mode = INT_TYPE_AI1_INT;
outb(0x83 | (dev->irq << 4), dev->iobase + PCL818_CONTROL); /* Pacer+IRQ */
case 0:
if (!devpriv->usefifo) {
/* IRQ */
/* rt_printk("IRQ\n"); */
if (mode == 1) {
devpriv->ai_mode = INT_TYPE_AI1_INT;
/* Pacer+IRQ */
outb(0x83 | (dev->irq << 4), dev->iobase + PCL818_CONTROL);
} else {
devpriv->ai_mode = INT_TYPE_AI3_INT;
/* Ext trig+IRQ */
outb(0x82 | (dev->irq << 4), dev->iobase + PCL818_CONTROL);
}
} else {
devpriv->ai_mode = INT_TYPE_AI3_INT;
outb(0x82 | (dev->irq << 4), dev->iobase + PCL818_CONTROL); /* Ext trig+IRQ */
};
break;
case -1: /* FIFO */
outb(1, dev->iobase + PCL818_FI_ENABLE); /* enable FIFO */
if (mode == 1) {
devpriv->ai_mode = INT_TYPE_AI1_FIFO;
outb(0x03, dev->iobase + PCL818_CONTROL); /* Pacer */
} else {
devpriv->ai_mode = INT_TYPE_AI3_FIFO;
outb(0x02, dev->iobase + PCL818_CONTROL);
}; /* Ext trig */
break;
/* FIFO */
/* enable FIFO */
outb(1, dev->iobase + PCL818_FI_ENABLE);
if (mode == 1) {
devpriv->ai_mode = INT_TYPE_AI1_FIFO;
/* Pacer */
outb(0x03, dev->iobase + PCL818_CONTROL);
} else {
devpriv->ai_mode = INT_TYPE_AI3_FIFO;
outb(0x02, dev->iobase + PCL818_CONTROL);
}
}
}
start_pacer(dev, mode, divisor1, divisor2);
@ -1687,7 +1693,8 @@ static int pcl818_attach(struct comedi_device * dev, struct comedi_devconfig * i
{
int ret;
unsigned long iobase;
unsigned int irq, dma;
unsigned int irq;
int dma;
unsigned long pages;
struct comedi_subdevice *s;