|
@@ -297,9 +297,11 @@ static const struct pcl818_board boardtypes[] = {
|
|
|
|
|
|
struct pcl818_private {
|
|
|
struct comedi_isadma *dma;
|
|
|
- unsigned int ns_min; /* manimal allowed delay between samples (in us) for actual card */
|
|
|
+ /* manimal allowed delay between samples (in us) for actual card */
|
|
|
+ unsigned int ns_min;
|
|
|
int i8253_osc_base; /* 1/frequency of on board oscilator in ns */
|
|
|
- unsigned int act_chanlist[16]; /* MUX setting for actual AI operations */
|
|
|
+ /* MUX setting for actual AI operations */
|
|
|
+ unsigned int act_chanlist[16];
|
|
|
unsigned int act_chanlist_len; /* how long is actual MUX list */
|
|
|
unsigned int act_chanlist_pos; /* actual position in MUX list */
|
|
|
unsigned int divisor1;
|
|
@@ -618,7 +620,8 @@ static int check_channel_list(struct comedi_device *dev,
|
|
|
break;
|
|
|
nowmustbechan =
|
|
|
(CR_CHAN(chansegment[i - 1]) + 1) % s->n_chan;
|
|
|
- if (nowmustbechan != CR_CHAN(chanlist[i])) { /* channel list isn't continuous :-( */
|
|
|
+ if (nowmustbechan != CR_CHAN(chanlist[i])) {
|
|
|
+ /* channel list isn't continuous :-( */
|
|
|
dev_dbg(dev->class_dev,
|
|
|
"channel list must be continuous! chanlist[%i]=%d but must be %d or %d!\n",
|
|
|
i, CR_CHAN(chanlist[i]), nowmustbechan,
|
|
@@ -1124,8 +1127,10 @@ static int pcl818_attach(struct comedi_device *dev, struct comedi_devconfig *it)
|
|
|
devpriv->ns_min = board->ns_min;
|
|
|
|
|
|
if (!board->is_818) {
|
|
|
- if ((it->options[6] == 1) || (it->options[6] == 100))
|
|
|
- devpriv->ns_min = 10000; /* extended PCL718 to 100kHz DAC */
|
|
|
+ if ((it->options[6] == 1) || (it->options[6] == 100)) {
|
|
|
+ /* extended PCL718 to 100kHz DAC */
|
|
|
+ devpriv->ns_min = 10000;
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
pcl818_reset(dev);
|