|
@@ -674,7 +674,9 @@ static void interrupt_pci1710_every_sample(void *d)
|
|
|
s->async->buf_int_count, s->async->buf_int_ptr,
|
|
|
s->async->buf_user_count, s->async->buf_user_ptr);
|
|
|
DPRINTK("adv_pci1710 EDBG: EOS2\n");
|
|
|
- if ((!devpriv->neverending_ai) && (devpriv->ai_act_scan >= devpriv->ai_scans)) { /* all data sampled */
|
|
|
+ if ((!devpriv->neverending_ai) &&
|
|
|
+ (devpriv->ai_act_scan >= devpriv->ai_scans)) {
|
|
|
+ /* all data sampled */
|
|
|
pci171x_ai_cancel(dev, s);
|
|
|
s->async->events |= COMEDI_CB_EOA;
|
|
|
comedi_event(dev, s);
|
|
@@ -802,8 +804,8 @@ static irqreturn_t interrupt_service_pci1710(int irq, void *d)
|
|
|
irq);
|
|
|
if (!dev->attached) /* is device attached? */
|
|
|
return IRQ_NONE; /* no, exit */
|
|
|
-
|
|
|
- if (!(inw(dev->iobase + PCI171x_STATUS) & Status_IRQ)) /* is this interrupt from our board? */
|
|
|
+ /* is this interrupt from our board? */
|
|
|
+ if (!(inw(dev->iobase + PCI171x_STATUS) & Status_IRQ))
|
|
|
return IRQ_NONE; /* no, exit */
|
|
|
|
|
|
DPRINTK("adv_pci1710 EDBG: interrupt_service_pci1710() ST: %4x\n",
|
|
@@ -812,7 +814,7 @@ static irqreturn_t interrupt_service_pci1710(int irq, void *d)
|
|
|
if (devpriv->ai_et) { /* Switch from initial TRIG_EXT to TRIG_xxx. */
|
|
|
devpriv->ai_et = 0;
|
|
|
devpriv->CntrlReg &= Control_CNT0;
|
|
|
- devpriv->CntrlReg |= Control_SW; /* set software trigger */
|
|
|
+ devpriv->CntrlReg |= Control_SW; /* set software trigger */
|
|
|
outw(devpriv->CntrlReg, dev->iobase + PCI171x_CONTROL);
|
|
|
devpriv->CntrlReg = devpriv->ai_et_CntrlReg;
|
|
|
outb(0, dev->iobase + PCI171x_CLRFIFO);
|
|
@@ -863,7 +865,8 @@ static int pci171x_ai_docmd_and_mode(int mode, struct comedi_device *dev,
|
|
|
devpriv->neverending_ai = 0;
|
|
|
|
|
|
devpriv->CntrlReg &= Control_CNT0;
|
|
|
- if ((devpriv->ai_flags & TRIG_WAKE_EOS)) { /* don't we want wake up every scan? devpriv->ai_eos=1; */
|
|
|
+ /* don't we want wake up every scan? devpriv->ai_eos=1; */
|
|
|
+ if ((devpriv->ai_flags & TRIG_WAKE_EOS)) {
|
|
|
devpriv->ai_eos = 1;
|
|
|
} else {
|
|
|
devpriv->CntrlReg |= Control_ONEFH;
|
|
@@ -980,13 +983,13 @@ static int pci171x_ai_cmdtest(struct comedi_device *dev,
|
|
|
#ifdef PCI171X_EXTDEBUG
|
|
|
pci171x_cmdtest_out(1, cmd);
|
|
|
#endif
|
|
|
- DPRINTK
|
|
|
- ("adv_pci1710 EDBG: BGN: pci171x_ai_cmdtest(...) err=%d ret=1\n",
|
|
|
- err);
|
|
|
+ DPRINTK(
|
|
|
+ "adv_pci1710 EDBG: BGN: pci171x_ai_cmdtest(...) err=%d ret=1\n",
|
|
|
+ err);
|
|
|
return 1;
|
|
|
}
|
|
|
|
|
|
- /* step 2: make sure trigger sources are unique and mutually compatible */
|
|
|
+ /* step2: make sure trigger srcs are unique and mutually compatible */
|
|
|
|
|
|
if (cmd->start_src != TRIG_NOW && cmd->start_src != TRIG_EXT) {
|
|
|
cmd->start_src = TRIG_NOW;
|
|
@@ -1013,9 +1016,9 @@ static int pci171x_ai_cmdtest(struct comedi_device *dev,
|
|
|
#ifdef PCI171X_EXTDEBUG
|
|
|
pci171x_cmdtest_out(2, cmd);
|
|
|
#endif
|
|
|
- DPRINTK
|
|
|
- ("adv_pci1710 EDBG: BGN: pci171x_ai_cmdtest(...) err=%d ret=2\n",
|
|
|
- err);
|
|
|
+ DPRINTK(
|
|
|
+ "adv_pci1710 EDBG: BGN: pci171x_ai_cmdtest(...) err=%d ret=2\n",
|
|
|
+ err);
|
|
|
return 2;
|
|
|
}
|
|
|
|
|
@@ -1063,9 +1066,9 @@ static int pci171x_ai_cmdtest(struct comedi_device *dev,
|
|
|
#ifdef PCI171X_EXTDEBUG
|
|
|
pci171x_cmdtest_out(3, cmd);
|
|
|
#endif
|
|
|
- DPRINTK
|
|
|
- ("adv_pci1710 EDBG: BGN: pci171x_ai_cmdtest(...) err=%d ret=3\n",
|
|
|
- err);
|
|
|
+ DPRINTK(
|
|
|
+ "adv_pci1710 EDBG: BGN: pci171x_ai_cmdtest(...) err=%d ret=3\n",
|
|
|
+ err);
|
|
|
return 3;
|
|
|
}
|
|
|
|