← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to drivers/staging/comedi/drivers/adv_pci1710.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/staging/comedi/drivers/adv_pci1710.c
98
98
#define Status_FE       0x0100  /* 1=FIFO is empty */
99
99
#define Status_FH       0x0200  /* 1=FIFO is half full */
100
100
#define Status_FF       0x0400  /* 1=FIFO is full, fatal error */
101
 
#define Status_IRQ      0x0800  /* 1=IRQ occured */
 
101
#define Status_IRQ      0x0800  /* 1=IRQ occurred */
102
102
/* bits from control register (PCI171x_CONTROL) */
103
103
#define Control_CNT0    0x0040  /* 1=CNT0 have external source,
104
104
                                 * 0=have internal 100kHz source */
1161
1161
        }
1162
1162
 
1163
1163
        if (n_chan > 1) {
1164
 
                chansegment[0] = chanlist[0];   /*  first channel is everytime ok */
 
1164
                chansegment[0] = chanlist[0];   /*  first channel is every time ok */
1165
1165
                for (i = 1, seglen = 1; i < n_chan; i++, seglen++) {    /*  build part of chanlist */
1166
1166
                        /*  printk("%d. %d %d\n",i,CR_CHAN(chanlist[i]),CR_RANGE(chanlist[i])); */
1167
1167
                        if (chanlist[0] == chanlist[i])
1176
1176
                            (CR_CHAN(chansegment[i - 1]) + 1) % s->n_chan;
1177
1177
                        if (CR_AREF(chansegment[i - 1]) == AREF_DIFF)
1178
1178
                                nowmustbechan = (nowmustbechan + 1) % s->n_chan;
1179
 
                        if (nowmustbechan != CR_CHAN(chanlist[i])) {    /*  channel list isn't continous :-( */
 
1179
                        if (nowmustbechan != CR_CHAN(chanlist[i])) {    /*  channel list isn't continuous :-( */
1180
1180
                                printk
1181
 
                                    ("channel list must be continous! chanlist[%i]=%d but must be %d or %d!\n",
 
1181
                                    ("channel list must be continuous! chanlist[%i]=%d but must be %d or %d!\n",
1182
1182
                                     i, CR_CHAN(chanlist[i]), nowmustbechan,
1183
1183
                                     CR_CHAN(chanlist[0]));
1184
1184
                                return 0;