diff options
author | Stewart Robertson <stewart_r@aliencamel.com> | 2010-02-21 05:13:21 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-03-03 19:43:03 -0500 |
commit | e41a6f6d9cb7404420d596f27609a3f4f55dcaf5 (patch) | |
tree | dcbe3fca863c535b0ec3f5e9db5a6fed7abee601 | |
parent | af71b816cdc623bc7c0b616ededbf3dadaf03156 (diff) |
Staging: comedi: fix coding style issues in ni_labpc.c
This is a patch to the ni_labpc.c file that fixes the brace warnings and
comments over 80 characters found by the checkpatch.pl tool. Some code
still goes over 80 characters because I didn't know what to do with it.
Signed-off-by: Stewart Robertson <stewart_r@aliencamel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/staging/comedi/drivers/ni_labpc.c | 231 |
1 files changed, 145 insertions, 86 deletions
diff --git a/drivers/staging/comedi/drivers/ni_labpc.c b/drivers/staging/comedi/drivers/ni_labpc.c index 566b791e00c7..bc5662e2a9bf 100644 --- a/drivers/staging/comedi/drivers/ni_labpc.c +++ b/drivers/staging/comedi/drivers/ni_labpc.c | |||
@@ -90,8 +90,10 @@ NI manuals: | |||
90 | 90 | ||
91 | #define DRV_NAME "ni_labpc" | 91 | #define DRV_NAME "ni_labpc" |
92 | 92 | ||
93 | #define LABPC_SIZE 32 /* size of io region used by board */ | 93 | /* size of io region used by board */ |
94 | #define LABPC_TIMER_BASE 500 /* 2 MHz master clock */ | 94 | #define LABPC_SIZE 32 |
95 | /* 2 MHz master clock */ | ||
96 | #define LABPC_TIMER_BASE 500 | ||
95 | 97 | ||
96 | /* Registers for the lab-pc+ */ | 98 | /* Registers for the lab-pc+ */ |
97 | 99 | ||
@@ -99,69 +101,110 @@ NI manuals: | |||
99 | #define COMMAND1_REG 0x0 | 101 | #define COMMAND1_REG 0x0 |
100 | #define ADC_GAIN_MASK (0x7 << 4) | 102 | #define ADC_GAIN_MASK (0x7 << 4) |
101 | #define ADC_CHAN_BITS(x) ((x) & 0x7) | 103 | #define ADC_CHAN_BITS(x) ((x) & 0x7) |
102 | #define ADC_SCAN_EN_BIT 0x80 /* enables multi channel scans */ | 104 | /* enables multi channel scans */ |
105 | #define ADC_SCAN_EN_BIT 0x80 | ||
103 | #define COMMAND2_REG 0x1 | 106 | #define COMMAND2_REG 0x1 |
104 | #define PRETRIG_BIT 0x1 /* enable pretriggering (used in conjunction with SWTRIG) */ | 107 | /* enable pretriggering (used in conjunction with SWTRIG) */ |
105 | #define HWTRIG_BIT 0x2 /* enable paced conversions on external trigger */ | 108 | #define PRETRIG_BIT 0x1 |
106 | #define SWTRIG_BIT 0x4 /* enable paced conversions */ | 109 | /* enable paced conversions on external trigger */ |
107 | #define CASCADE_BIT 0x8 /* use two cascaded counters for pacing */ | 110 | #define HWTRIG_BIT 0x2 |
111 | /* enable paced conversions */ | ||
112 | #define SWTRIG_BIT 0x4 | ||
113 | /* use two cascaded counters for pacing */ | ||
114 | #define CASCADE_BIT 0x8 | ||
108 | #define DAC_PACED_BIT(channel) (0x40 << ((channel) & 0x1)) | 115 | #define DAC_PACED_BIT(channel) (0x40 << ((channel) & 0x1)) |
109 | #define COMMAND3_REG 0x2 | 116 | #define COMMAND3_REG 0x2 |
110 | #define DMA_EN_BIT 0x1 /* enable dma transfers */ | 117 | /* enable dma transfers */ |
111 | #define DIO_INTR_EN_BIT 0x2 /* enable interrupts for 8255 */ | 118 | #define DMA_EN_BIT 0x1 |
112 | #define DMATC_INTR_EN_BIT 0x4 /* enable dma terminal count interrupt */ | 119 | /* enable interrupts for 8255 */ |
113 | #define TIMER_INTR_EN_BIT 0x8 /* enable timer interrupt */ | 120 | #define DIO_INTR_EN_BIT 0x2 |
114 | #define ERR_INTR_EN_BIT 0x10 /* enable error interrupt */ | 121 | /* enable dma terminal count interrupt */ |
115 | #define ADC_FNE_INTR_EN_BIT 0x20 /* enable fifo not empty interrupt */ | 122 | #define DMATC_INTR_EN_BIT 0x4 |
123 | /* enable timer interrupt */ | ||
124 | #define TIMER_INTR_EN_BIT 0x8 | ||
125 | /* enable error interrupt */ | ||
126 | #define ERR_INTR_EN_BIT 0x10 | ||
127 | /* enable fifo not empty interrupt */ | ||
128 | #define ADC_FNE_INTR_EN_BIT 0x20 | ||
116 | #define ADC_CONVERT_REG 0x3 | 129 | #define ADC_CONVERT_REG 0x3 |
117 | #define DAC_LSB_REG(channel) (0x4 + 2 * ((channel) & 0x1)) | 130 | #define DAC_LSB_REG(channel) (0x4 + 2 * ((channel) & 0x1)) |
118 | #define DAC_MSB_REG(channel) (0x5 + 2 * ((channel) & 0x1)) | 131 | #define DAC_MSB_REG(channel) (0x5 + 2 * ((channel) & 0x1)) |
119 | #define ADC_CLEAR_REG 0x8 | 132 | #define ADC_CLEAR_REG 0x8 |
120 | #define DMATC_CLEAR_REG 0xa | 133 | #define DMATC_CLEAR_REG 0xa |
121 | #define TIMER_CLEAR_REG 0xc | 134 | #define TIMER_CLEAR_REG 0xc |
122 | #define COMMAND6_REG 0xe /* 1200 boards only */ | 135 | /* 1200 boards only */ |
123 | #define ADC_COMMON_BIT 0x1 /* select ground or common-mode reference */ | 136 | #define COMMAND6_REG 0xe |
124 | #define ADC_UNIP_BIT 0x2 /* adc unipolar */ | 137 | /* select ground or common-mode reference */ |
125 | #define DAC_UNIP_BIT(channel) (0x4 << ((channel) & 0x1)) /* dac unipolar */ | 138 | #define ADC_COMMON_BIT 0x1 |
126 | #define ADC_FHF_INTR_EN_BIT 0x20 /* enable fifo half full interrupt */ | 139 | /* adc unipolar */ |
127 | #define A1_INTR_EN_BIT 0x40 /* enable interrupt on end of hardware count */ | 140 | #define ADC_UNIP_BIT 0x2 |
128 | #define ADC_SCAN_UP_BIT 0x80 /* scan up from channel zero instead of down to zero */ | 141 | /* dac unipolar */ |
142 | #define DAC_UNIP_BIT(channel) (0x4 << ((channel) & 0x1)) | ||
143 | /* enable fifo half full interrupt */ | ||
144 | #define ADC_FHF_INTR_EN_BIT 0x20 | ||
145 | /* enable interrupt on end of hardware count */ | ||
146 | #define A1_INTR_EN_BIT 0x40 | ||
147 | /* scan up from channel zero instead of down to zero */ | ||
148 | #define ADC_SCAN_UP_BIT 0x80 | ||
129 | #define COMMAND4_REG 0xf | 149 | #define COMMAND4_REG 0xf |
130 | #define INTERVAL_SCAN_EN_BIT 0x1 /* enables 'interval' scanning */ | 150 | /* enables 'interval' scanning */ |
131 | #define EXT_SCAN_EN_BIT 0x2 /* enables external signal on counter b1 output to trigger scan */ | 151 | #define INTERVAL_SCAN_EN_BIT 0x1 |
132 | #define EXT_CONVERT_OUT_BIT 0x4 /* chooses direction (output or input) for EXTCONV* line */ | 152 | /* enables external signal on counter b1 output to trigger scan */ |
133 | #define ADC_DIFF_BIT 0x8 /* chooses differential inputs for adc (in conjunction with board jumper) */ | 153 | #define EXT_SCAN_EN_BIT 0x2 |
154 | /* chooses direction (output or input) for EXTCONV* line */ | ||
155 | #define EXT_CONVERT_OUT_BIT 0x4 | ||
156 | /* chooses differential inputs for adc (in conjunction with board jumper) */ | ||
157 | #define ADC_DIFF_BIT 0x8 | ||
134 | #define EXT_CONVERT_DISABLE_BIT 0x10 | 158 | #define EXT_CONVERT_DISABLE_BIT 0x10 |
135 | #define COMMAND5_REG 0x1c /* 1200 boards only, calibration stuff */ | 159 | /* 1200 boards only, calibration stuff */ |
136 | #define EEPROM_WRITE_UNPROTECT_BIT 0x4 /* enable eeprom for write */ | 160 | #define COMMAND5_REG 0x1c |
137 | #define DITHER_EN_BIT 0x8 /* enable dithering */ | 161 | /* enable eeprom for write */ |
138 | #define CALDAC_LOAD_BIT 0x10 /* load calibration dac */ | 162 | #define EEPROM_WRITE_UNPROTECT_BIT 0x4 |
139 | #define SCLOCK_BIT 0x20 /* serial clock - rising edge writes, falling edge reads */ | 163 | /* enable dithering */ |
140 | #define SDATA_BIT 0x40 /* serial data bit for writing to eeprom or calibration dacs */ | 164 | #define DITHER_EN_BIT 0x8 |
141 | #define EEPROM_EN_BIT 0x80 /* enable eeprom for read/write */ | 165 | /* load calibration dac */ |
166 | #define CALDAC_LOAD_BIT 0x10 | ||
167 | /* serial clock - rising edge writes, falling edge reads */ | ||
168 | #define SCLOCK_BIT 0x20 | ||
169 | /* serial data bit for writing to eeprom or calibration dacs */ | ||
170 | #define SDATA_BIT 0x40 | ||
171 | /* enable eeprom for read/write */ | ||
172 | #define EEPROM_EN_BIT 0x80 | ||
142 | #define INTERVAL_COUNT_REG 0x1e | 173 | #define INTERVAL_COUNT_REG 0x1e |
143 | #define INTERVAL_LOAD_REG 0x1f | 174 | #define INTERVAL_LOAD_REG 0x1f |
144 | #define INTERVAL_LOAD_BITS 0x1 | 175 | #define INTERVAL_LOAD_BITS 0x1 |
145 | 176 | ||
146 | /* read-only registers */ | 177 | /* read-only registers */ |
147 | #define STATUS1_REG 0x0 | 178 | #define STATUS1_REG 0x0 |
148 | #define DATA_AVAIL_BIT 0x1 /* data is available in fifo */ | 179 | /* data is available in fifo */ |
149 | #define OVERRUN_BIT 0x2 /* overrun has occurred */ | 180 | #define DATA_AVAIL_BIT 0x1 |
150 | #define OVERFLOW_BIT 0x4 /* fifo overflow */ | 181 | /* overrun has occurred */ |
151 | #define TIMER_BIT 0x8 /* timer interrupt has occured */ | 182 | #define OVERRUN_BIT 0x2 |
152 | #define DMATC_BIT 0x10 /* dma terminal count has occured */ | 183 | /* fifo overflow */ |
153 | #define EXT_TRIG_BIT 0x40 /* external trigger has occured */ | 184 | #define OVERFLOW_BIT 0x4 |
154 | #define STATUS2_REG 0x1d /* 1200 boards only */ | 185 | /* timer interrupt has occured */ |
155 | #define EEPROM_OUT_BIT 0x1 /* programmable eeprom serial output */ | 186 | #define TIMER_BIT 0x8 |
156 | #define A1_TC_BIT 0x2 /* counter A1 terminal count */ | 187 | /* dma terminal count has occured */ |
157 | #define FNHF_BIT 0x4 /* fifo not half full */ | 188 | #define DMATC_BIT 0x10 |
189 | /* external trigger has occured */ | ||
190 | #define EXT_TRIG_BIT 0x40 | ||
191 | /* 1200 boards only */ | ||
192 | #define STATUS2_REG 0x1d | ||
193 | /* programmable eeprom serial output */ | ||
194 | #define EEPROM_OUT_BIT 0x1 | ||
195 | /* counter A1 terminal count */ | ||
196 | #define A1_TC_BIT 0x2 | ||
197 | /* fifo not half full */ | ||
198 | #define FNHF_BIT 0x4 | ||
158 | #define ADC_FIFO_REG 0xa | 199 | #define ADC_FIFO_REG 0xa |
159 | 200 | ||
160 | #define DIO_BASE_REG 0x10 | 201 | #define DIO_BASE_REG 0x10 |
161 | #define COUNTER_A_BASE_REG 0x14 | 202 | #define COUNTER_A_BASE_REG 0x14 |
162 | #define COUNTER_A_CONTROL_REG (COUNTER_A_BASE_REG + 0x3) | 203 | #define COUNTER_A_CONTROL_REG (COUNTER_A_BASE_REG + 0x3) |
163 | #define INIT_A0_BITS 0x14 /* check modes put conversion pacer output in harmless state (a0 mode 2) */ | 204 | /* check modes put conversion pacer output in harmless state (a0 mode 2) */ |
164 | #define INIT_A1_BITS 0x70 /* put hardware conversion counter output in harmless state (a1 mode 0) */ | 205 | #define INIT_A0_BITS 0x14 |
206 | /* put hardware conversion counter output in harmless state (a1 mode 0) */ | ||
207 | #define INIT_A1_BITS 0x70 | ||
165 | #define COUNTER_B_BASE_REG 0x18 | 208 | #define COUNTER_B_BASE_REG 0x18 |
166 | 209 | ||
167 | static int labpc_attach(struct comedi_device *dev, struct comedi_devconfig *it); | 210 | static int labpc_attach(struct comedi_device *dev, struct comedi_devconfig *it); |
@@ -423,7 +466,7 @@ static const struct labpc_board_struct labpc_boards[] = { | |||
423 | .ai_scan_up = 1, | 466 | .ai_scan_up = 1, |
424 | .memory_mapped_io = 1, | 467 | .memory_mapped_io = 1, |
425 | }, | 468 | }, |
426 | /* dummy entry so pci board works when comedi_config is passed driver name */ | 469 | /* dummy entry so pci board works when comedi_config is passed driver name */ |
427 | { | 470 | { |
428 | .name = DRV_NAME, | 471 | .name = DRV_NAME, |
429 | .bustype = pci_bustype, | 472 | .bustype = pci_bustype, |
@@ -436,8 +479,10 @@ static const struct labpc_board_struct labpc_boards[] = { | |||
436 | */ | 479 | */ |
437 | #define thisboard ((struct labpc_board_struct *)dev->board_ptr) | 480 | #define thisboard ((struct labpc_board_struct *)dev->board_ptr) |
438 | 481 | ||
439 | static const int dma_buffer_size = 0xff00; /* size in bytes of dma buffer */ | 482 | /* size in bytes of dma buffer */ |
440 | static const int sample_size = 2; /* 2 bytes per sample */ | 483 | static const int dma_buffer_size = 0xff00; |
484 | /* 2 bytes per sample */ | ||
485 | static const int sample_size = 2; | ||
441 | 486 | ||
442 | #define devpriv ((struct labpc_private *)dev->private) | 487 | #define devpriv ((struct labpc_private *)dev->private) |
443 | 488 | ||
@@ -511,7 +556,7 @@ int labpc_common_attach(struct comedi_device *dev, unsigned long iobase, | |||
511 | devpriv->read_byte = labpc_inb; | 556 | devpriv->read_byte = labpc_inb; |
512 | devpriv->write_byte = labpc_outb; | 557 | devpriv->write_byte = labpc_outb; |
513 | } | 558 | } |
514 | /* initialize board's command registers */ | 559 | /* initialize board's command registers */ |
515 | devpriv->write_byte(devpriv->command1_bits, dev->iobase + COMMAND1_REG); | 560 | devpriv->write_byte(devpriv->command1_bits, dev->iobase + COMMAND1_REG); |
516 | devpriv->write_byte(devpriv->command2_bits, dev->iobase + COMMAND2_REG); | 561 | devpriv->write_byte(devpriv->command2_bits, dev->iobase + COMMAND2_REG); |
517 | devpriv->write_byte(devpriv->command3_bits, dev->iobase + COMMAND3_REG); | 562 | devpriv->write_byte(devpriv->command3_bits, dev->iobase + COMMAND3_REG); |
@@ -536,12 +581,12 @@ int labpc_common_attach(struct comedi_device *dev, unsigned long iobase, | |||
536 | } | 581 | } |
537 | dev->irq = irq; | 582 | dev->irq = irq; |
538 | 583 | ||
539 | /* grab dma channel */ | 584 | /* grab dma channel */ |
540 | if (dma_chan > 3) { | 585 | if (dma_chan > 3) { |
541 | printk(" invalid dma channel %u\n", dma_chan); | 586 | printk(" invalid dma channel %u\n", dma_chan); |
542 | return -EINVAL; | 587 | return -EINVAL; |
543 | } else if (dma_chan) { | 588 | } else if (dma_chan) { |
544 | /* allocate dma buffer */ | 589 | /* allocate dma buffer */ |
545 | devpriv->dma_buffer = | 590 | devpriv->dma_buffer = |
546 | kmalloc(dma_buffer_size, GFP_KERNEL | GFP_DMA); | 591 | kmalloc(dma_buffer_size, GFP_KERNEL | GFP_DMA); |
547 | if (devpriv->dma_buffer == NULL) { | 592 | if (devpriv->dma_buffer == NULL) { |
@@ -573,7 +618,7 @@ int labpc_common_attach(struct comedi_device *dev, unsigned long iobase, | |||
573 | SDF_READABLE | SDF_GROUND | SDF_COMMON | SDF_DIFF | SDF_CMD_READ; | 618 | SDF_READABLE | SDF_GROUND | SDF_COMMON | SDF_DIFF | SDF_CMD_READ; |
574 | s->n_chan = 8; | 619 | s->n_chan = 8; |
575 | s->len_chanlist = 8; | 620 | s->len_chanlist = 8; |
576 | s->maxdata = (1 << 12) - 1; /* 12 bit resolution */ | 621 | s->maxdata = (1 << 12) - 1; /* 12 bit resolution */ |
577 | s->range_table = thisboard->ai_range_table; | 622 | s->range_table = thisboard->ai_range_table; |
578 | s->do_cmd = labpc_ai_cmd; | 623 | s->do_cmd = labpc_ai_cmd; |
579 | s->do_cmdtest = labpc_ai_cmdtest; | 624 | s->do_cmdtest = labpc_ai_cmdtest; |
@@ -667,7 +712,7 @@ static int labpc_attach(struct comedi_device *dev, struct comedi_devconfig *it) | |||
667 | if (alloc_private(dev, sizeof(struct labpc_private)) < 0) | 712 | if (alloc_private(dev, sizeof(struct labpc_private)) < 0) |
668 | return -ENOMEM; | 713 | return -ENOMEM; |
669 | 714 | ||
670 | /* get base address, irq etc. based on bustype */ | 715 | /* get base address, irq etc. based on bustype */ |
671 | switch (thisboard->bustype) { | 716 | switch (thisboard->bustype) { |
672 | case isa_bustype: | 717 | case isa_bustype: |
673 | iobase = it->options[0]; | 718 | iobase = it->options[0]; |
@@ -712,7 +757,7 @@ static int labpc_find_device(struct comedi_device *dev, int bus, int slot) | |||
712 | for (mite = mite_devices; mite; mite = mite->next) { | 757 | for (mite = mite_devices; mite; mite = mite->next) { |
713 | if (mite->used) | 758 | if (mite->used) |
714 | continue; | 759 | continue; |
715 | /* if bus/slot are specified then make sure we have the right bus/slot */ | 760 | /* if bus/slot are specified then make sure we have the right bus/slot */ |
716 | if (bus || slot) { | 761 | if (bus || slot) { |
717 | if (bus != mite->pcidev->bus->number | 762 | if (bus != mite->pcidev->bus->number |
718 | || slot != PCI_SLOT(mite->pcidev->devfn)) | 763 | || slot != PCI_SLOT(mite->pcidev->devfn)) |
@@ -723,7 +768,7 @@ static int labpc_find_device(struct comedi_device *dev, int bus, int slot) | |||
723 | continue; | 768 | continue; |
724 | if (mite_device_id(mite) == labpc_boards[i].device_id) { | 769 | if (mite_device_id(mite) == labpc_boards[i].device_id) { |
725 | devpriv->mite = mite; | 770 | devpriv->mite = mite; |
726 | /* fixup board pointer, in case we were using the dummy "ni_labpc" entry */ | 771 | /* fixup board pointer, in case we were using the dummy "ni_labpc" entry */ |
727 | dev->board_ptr = &labpc_boards[i]; | 772 | dev->board_ptr = &labpc_boards[i]; |
728 | return 0; | 773 | return 0; |
729 | } | 774 | } |
@@ -991,7 +1036,7 @@ static int labpc_ai_cmdtest(struct comedi_device *dev, | |||
991 | cmd->stop_src != TRIG_EXT && cmd->stop_src != TRIG_NONE) | 1036 | cmd->stop_src != TRIG_EXT && cmd->stop_src != TRIG_NONE) |
992 | err++; | 1037 | err++; |
993 | 1038 | ||
994 | /* can't have external stop and start triggers at once */ | 1039 | /* can't have external stop and start triggers at once */ |
995 | if (cmd->start_src == TRIG_EXT && cmd->stop_src == TRIG_EXT) | 1040 | if (cmd->start_src == TRIG_EXT && cmd->stop_src == TRIG_EXT) |
996 | err++; | 1041 | err++; |
997 | 1042 | ||
@@ -1019,7 +1064,7 @@ static int labpc_ai_cmdtest(struct comedi_device *dev, | |||
1019 | err++; | 1064 | err++; |
1020 | } | 1065 | } |
1021 | } | 1066 | } |
1022 | /* make sure scan timing is not too fast */ | 1067 | /* make sure scan timing is not too fast */ |
1023 | if (cmd->scan_begin_src == TRIG_TIMER) { | 1068 | if (cmd->scan_begin_src == TRIG_TIMER) { |
1024 | if (cmd->convert_src == TRIG_TIMER && | 1069 | if (cmd->convert_src == TRIG_TIMER && |
1025 | cmd->scan_begin_arg < | 1070 | cmd->scan_begin_arg < |
@@ -1035,7 +1080,7 @@ static int labpc_ai_cmdtest(struct comedi_device *dev, | |||
1035 | err++; | 1080 | err++; |
1036 | } | 1081 | } |
1037 | } | 1082 | } |
1038 | /* stop source */ | 1083 | /* stop source */ |
1039 | switch (cmd->stop_src) { | 1084 | switch (cmd->stop_src) { |
1040 | case TRIG_COUNT: | 1085 | case TRIG_COUNT: |
1041 | if (!cmd->stop_arg) { | 1086 | if (!cmd->stop_arg) { |
@@ -1092,7 +1137,7 @@ static int labpc_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) | |||
1092 | range = CR_RANGE(cmd->chanlist[0]); | 1137 | range = CR_RANGE(cmd->chanlist[0]); |
1093 | aref = CR_AREF(cmd->chanlist[0]); | 1138 | aref = CR_AREF(cmd->chanlist[0]); |
1094 | 1139 | ||
1095 | /* make sure board is disabled before setting up aquisition */ | 1140 | /* make sure board is disabled before setting up aquisition */ |
1096 | spin_lock_irqsave(&dev->spinlock, flags); | 1141 | spin_lock_irqsave(&dev->spinlock, flags); |
1097 | devpriv->command2_bits &= ~SWTRIG_BIT & ~HWTRIG_BIT & ~PRETRIG_BIT; | 1142 | devpriv->command2_bits &= ~SWTRIG_BIT & ~HWTRIG_BIT & ~PRETRIG_BIT; |
1098 | devpriv->write_byte(devpriv->command2_bits, dev->iobase + COMMAND2_REG); | 1143 | devpriv->write_byte(devpriv->command2_bits, dev->iobase + COMMAND2_REG); |
@@ -1172,17 +1217,18 @@ static int labpc_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) | |||
1172 | channel = CR_CHAN(cmd->chanlist[cmd->chanlist_len - 1]); | 1217 | channel = CR_CHAN(cmd->chanlist[cmd->chanlist_len - 1]); |
1173 | else | 1218 | else |
1174 | channel = CR_CHAN(cmd->chanlist[0]); | 1219 | channel = CR_CHAN(cmd->chanlist[0]); |
1175 | /* munge channel bits for differential / scan disabled mode */ | 1220 | /* munge channel bits for differential / scan disabled mode */ |
1176 | if (labpc_ai_scan_mode(cmd) != MODE_SINGLE_CHAN && aref == AREF_DIFF) | 1221 | if (labpc_ai_scan_mode(cmd) != MODE_SINGLE_CHAN && aref == AREF_DIFF) |
1177 | channel *= 2; | 1222 | channel *= 2; |
1178 | devpriv->command1_bits |= ADC_CHAN_BITS(channel); | 1223 | devpriv->command1_bits |= ADC_CHAN_BITS(channel); |
1179 | devpriv->command1_bits |= thisboard->ai_range_code[range]; | 1224 | devpriv->command1_bits |= thisboard->ai_range_code[range]; |
1180 | devpriv->write_byte(devpriv->command1_bits, dev->iobase + COMMAND1_REG); | 1225 | devpriv->write_byte(devpriv->command1_bits, dev->iobase + COMMAND1_REG); |
1181 | /* manual says to set scan enable bit on second pass */ | 1226 | /* manual says to set scan enable bit on second pass */ |
1182 | if (labpc_ai_scan_mode(cmd) == MODE_MULT_CHAN_UP || | 1227 | if (labpc_ai_scan_mode(cmd) == MODE_MULT_CHAN_UP || |
1183 | labpc_ai_scan_mode(cmd) == MODE_MULT_CHAN_DOWN) { | 1228 | labpc_ai_scan_mode(cmd) == MODE_MULT_CHAN_DOWN) { |
1184 | devpriv->command1_bits |= ADC_SCAN_EN_BIT; | 1229 | devpriv->command1_bits |= ADC_SCAN_EN_BIT; |
1185 | /* need a brief delay before enabling scan, or scan list will get screwed when you switch | 1230 | /* need a brief delay before enabling scan, or scan |
1231 | * list will get screwed when you switch | ||
1186 | * between scan up to scan down mode - dunno why */ | 1232 | * between scan up to scan down mode - dunno why */ |
1187 | udelay(1); | 1233 | udelay(1); |
1188 | devpriv->write_byte(devpriv->command1_bits, | 1234 | devpriv->write_byte(devpriv->command1_bits, |
@@ -1334,7 +1380,7 @@ static irqreturn_t labpc_interrupt(int irq, void *d) | |||
1334 | cmd = &async->cmd; | 1380 | cmd = &async->cmd; |
1335 | async->events = 0; | 1381 | async->events = 0; |
1336 | 1382 | ||
1337 | /* read board status */ | 1383 | /* read board status */ |
1338 | devpriv->status1_bits = devpriv->read_byte(dev->iobase + STATUS1_REG); | 1384 | devpriv->status1_bits = devpriv->read_byte(dev->iobase + STATUS1_REG); |
1339 | if (thisboard->register_layout == labpc_1200_layout) | 1385 | if (thisboard->register_layout == labpc_1200_layout) |
1340 | devpriv->status2_bits = | 1386 | devpriv->status2_bits = |
@@ -1348,7 +1394,7 @@ static irqreturn_t labpc_interrupt(int irq, void *d) | |||
1348 | } | 1394 | } |
1349 | 1395 | ||
1350 | if (devpriv->status1_bits & OVERRUN_BIT) { | 1396 | if (devpriv->status1_bits & OVERRUN_BIT) { |
1351 | /* clear error interrupt */ | 1397 | /* clear error interrupt */ |
1352 | devpriv->write_byte(0x1, dev->iobase + ADC_CLEAR_REG); | 1398 | devpriv->write_byte(0x1, dev->iobase + ADC_CLEAR_REG); |
1353 | async->events |= COMEDI_CB_ERROR | COMEDI_CB_EOA; | 1399 | async->events |= COMEDI_CB_ERROR | COMEDI_CB_EOA; |
1354 | comedi_event(dev, s); | 1400 | comedi_event(dev, s); |
@@ -1357,7 +1403,7 @@ static irqreturn_t labpc_interrupt(int irq, void *d) | |||
1357 | } | 1403 | } |
1358 | 1404 | ||
1359 | if (devpriv->current_transfer == isa_dma_transfer) { | 1405 | if (devpriv->current_transfer == isa_dma_transfer) { |
1360 | /* if a dma terminal count of external stop trigger has occurred */ | 1406 | /* if a dma terminal count of external stop trigger has occurred */ |
1361 | if (devpriv->status1_bits & DMATC_BIT || | 1407 | if (devpriv->status1_bits & DMATC_BIT || |
1362 | (thisboard->register_layout == labpc_1200_layout | 1408 | (thisboard->register_layout == labpc_1200_layout |
1363 | && devpriv->status2_bits & A1_TC_BIT)) { | 1409 | && devpriv->status2_bits & A1_TC_BIT)) { |
@@ -1532,41 +1578,41 @@ static int labpc_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, | |||
1532 | chan = CR_CHAN(insn->chanspec); | 1578 | chan = CR_CHAN(insn->chanspec); |
1533 | range = CR_RANGE(insn->chanspec); | 1579 | range = CR_RANGE(insn->chanspec); |
1534 | devpriv->command1_bits |= thisboard->ai_range_code[range]; | 1580 | devpriv->command1_bits |= thisboard->ai_range_code[range]; |
1535 | /* munge channel bits for differential/scan disabled mode */ | 1581 | /* munge channel bits for differential/scan disabled mode */ |
1536 | if (CR_AREF(insn->chanspec) == AREF_DIFF) | 1582 | if (CR_AREF(insn->chanspec) == AREF_DIFF) |
1537 | chan *= 2; | 1583 | chan *= 2; |
1538 | devpriv->command1_bits |= ADC_CHAN_BITS(chan); | 1584 | devpriv->command1_bits |= ADC_CHAN_BITS(chan); |
1539 | devpriv->write_byte(devpriv->command1_bits, dev->iobase + COMMAND1_REG); | 1585 | devpriv->write_byte(devpriv->command1_bits, dev->iobase + COMMAND1_REG); |
1540 | 1586 | ||
1541 | /* setup command6 register for 1200 boards */ | 1587 | /* setup command6 register for 1200 boards */ |
1542 | if (thisboard->register_layout == labpc_1200_layout) { | 1588 | if (thisboard->register_layout == labpc_1200_layout) { |
1543 | /* reference inputs to ground or common? */ | 1589 | /* reference inputs to ground or common? */ |
1544 | if (CR_AREF(insn->chanspec) != AREF_GROUND) | 1590 | if (CR_AREF(insn->chanspec) != AREF_GROUND) |
1545 | devpriv->command6_bits |= ADC_COMMON_BIT; | 1591 | devpriv->command6_bits |= ADC_COMMON_BIT; |
1546 | else | 1592 | else |
1547 | devpriv->command6_bits &= ~ADC_COMMON_BIT; | 1593 | devpriv->command6_bits &= ~ADC_COMMON_BIT; |
1548 | /* bipolar or unipolar range? */ | 1594 | /* bipolar or unipolar range? */ |
1549 | if (thisboard->ai_range_is_unipolar[range]) | 1595 | if (thisboard->ai_range_is_unipolar[range]) |
1550 | devpriv->command6_bits |= ADC_UNIP_BIT; | 1596 | devpriv->command6_bits |= ADC_UNIP_BIT; |
1551 | else | 1597 | else |
1552 | devpriv->command6_bits &= ~ADC_UNIP_BIT; | 1598 | devpriv->command6_bits &= ~ADC_UNIP_BIT; |
1553 | /* don't interrupt on fifo half full */ | 1599 | /* don't interrupt on fifo half full */ |
1554 | devpriv->command6_bits &= ~ADC_FHF_INTR_EN_BIT; | 1600 | devpriv->command6_bits &= ~ADC_FHF_INTR_EN_BIT; |
1555 | /* don't enable interrupt on counter a1 terminal count? */ | 1601 | /* don't enable interrupt on counter a1 terminal count? */ |
1556 | devpriv->command6_bits &= ~A1_INTR_EN_BIT; | 1602 | devpriv->command6_bits &= ~A1_INTR_EN_BIT; |
1557 | /* write to register */ | 1603 | /* write to register */ |
1558 | devpriv->write_byte(devpriv->command6_bits, | 1604 | devpriv->write_byte(devpriv->command6_bits, |
1559 | dev->iobase + COMMAND6_REG); | 1605 | dev->iobase + COMMAND6_REG); |
1560 | } | 1606 | } |
1561 | /* setup command4 register */ | 1607 | /* setup command4 register */ |
1562 | devpriv->command4_bits = 0; | 1608 | devpriv->command4_bits = 0; |
1563 | devpriv->command4_bits |= EXT_CONVERT_DISABLE_BIT; | 1609 | devpriv->command4_bits |= EXT_CONVERT_DISABLE_BIT; |
1564 | /* single-ended/differential */ | 1610 | /* single-ended/differential */ |
1565 | if (CR_AREF(insn->chanspec) == AREF_DIFF) | 1611 | if (CR_AREF(insn->chanspec) == AREF_DIFF) |
1566 | devpriv->command4_bits |= ADC_DIFF_BIT; | 1612 | devpriv->command4_bits |= ADC_DIFF_BIT; |
1567 | devpriv->write_byte(devpriv->command4_bits, dev->iobase + COMMAND4_REG); | 1613 | devpriv->write_byte(devpriv->command4_bits, dev->iobase + COMMAND4_REG); |
1568 | 1614 | ||
1569 | /* initialize pacer counter output to make sure it doesn't cause any problems */ | 1615 | /* initialize pacer counter output to make sure it doesn't cause any problems */ |
1570 | devpriv->write_byte(INIT_A0_BITS, dev->iobase + COUNTER_A_CONTROL_REG); | 1616 | devpriv->write_byte(INIT_A0_BITS, dev->iobase + COUNTER_A_CONTROL_REG); |
1571 | 1617 | ||
1572 | labpc_clear_adc_fifo(dev); | 1618 | labpc_clear_adc_fifo(dev); |
@@ -1603,7 +1649,7 @@ static int labpc_ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s, | |||
1603 | 1649 | ||
1604 | channel = CR_CHAN(insn->chanspec); | 1650 | channel = CR_CHAN(insn->chanspec); |
1605 | 1651 | ||
1606 | /* turn off pacing of analog output channel */ | 1652 | /* turn off pacing of analog output channel */ |
1607 | /* note: hardware bug in daqcard-1200 means pacing cannot | 1653 | /* note: hardware bug in daqcard-1200 means pacing cannot |
1608 | * be independently enabled/disabled for its the two channels */ | 1654 | * be independently enabled/disabled for its the two channels */ |
1609 | spin_lock_irqsave(&dev->spinlock, flags); | 1655 | spin_lock_irqsave(&dev->spinlock, flags); |
@@ -1611,7 +1657,7 @@ static int labpc_ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s, | |||
1611 | devpriv->write_byte(devpriv->command2_bits, dev->iobase + COMMAND2_REG); | 1657 | devpriv->write_byte(devpriv->command2_bits, dev->iobase + COMMAND2_REG); |
1612 | spin_unlock_irqrestore(&dev->spinlock, flags); | 1658 | spin_unlock_irqrestore(&dev->spinlock, flags); |
1613 | 1659 | ||
1614 | /* set range */ | 1660 | /* set range */ |
1615 | if (thisboard->register_layout == labpc_1200_layout) { | 1661 | if (thisboard->register_layout == labpc_1200_layout) { |
1616 | range = CR_RANGE(insn->chanspec); | 1662 | range = CR_RANGE(insn->chanspec); |
1617 | if (range & AO_RANGE_IS_UNIPOLAR) | 1663 | if (range & AO_RANGE_IS_UNIPOLAR) |
@@ -1622,13 +1668,13 @@ static int labpc_ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s, | |||
1622 | devpriv->write_byte(devpriv->command6_bits, | 1668 | devpriv->write_byte(devpriv->command6_bits, |
1623 | dev->iobase + COMMAND6_REG); | 1669 | dev->iobase + COMMAND6_REG); |
1624 | } | 1670 | } |
1625 | /* send data */ | 1671 | /* send data */ |
1626 | lsb = data[0] & 0xff; | 1672 | lsb = data[0] & 0xff; |
1627 | msb = (data[0] >> 8) & 0xff; | 1673 | msb = (data[0] >> 8) & 0xff; |
1628 | devpriv->write_byte(lsb, dev->iobase + DAC_LSB_REG(channel)); | 1674 | devpriv->write_byte(lsb, dev->iobase + DAC_LSB_REG(channel)); |
1629 | devpriv->write_byte(msb, dev->iobase + DAC_MSB_REG(channel)); | 1675 | devpriv->write_byte(msb, dev->iobase + DAC_MSB_REG(channel)); |
1630 | 1676 | ||
1631 | /* remember value for readback */ | 1677 | /* remember value for readback */ |
1632 | devpriv->ao_value[channel] = data[0]; | 1678 | devpriv->ao_value[channel] = data[0]; |
1633 | 1679 | ||
1634 | return 1; | 1680 | return 1; |
@@ -1700,14 +1746,14 @@ static unsigned int labpc_suggest_transfer_size(struct comedi_cmd cmd) | |||
1700 | 1746 | ||
1701 | if (cmd.convert_src == TRIG_TIMER) | 1747 | if (cmd.convert_src == TRIG_TIMER) |
1702 | freq = 1000000000 / cmd.convert_arg; | 1748 | freq = 1000000000 / cmd.convert_arg; |
1703 | /* return some default value */ | 1749 | /* return some default value */ |
1704 | else | 1750 | else |
1705 | freq = 0xffffffff; | 1751 | freq = 0xffffffff; |
1706 | 1752 | ||
1707 | /* make buffer fill in no more than 1/3 second */ | 1753 | /* make buffer fill in no more than 1/3 second */ |
1708 | size = (freq / 3) * sample_size; | 1754 | size = (freq / 3) * sample_size; |
1709 | 1755 | ||
1710 | /* set a minimum and maximum size allowed */ | 1756 | /* set a minimum and maximum size allowed */ |
1711 | if (size > dma_buffer_size) | 1757 | if (size > dma_buffer_size) |
1712 | size = dma_buffer_size - dma_buffer_size % sample_size; | 1758 | size = dma_buffer_size - dma_buffer_size % sample_size; |
1713 | else if (size < sample_size) | 1759 | else if (size < sample_size) |
@@ -1719,13 +1765,21 @@ static unsigned int labpc_suggest_transfer_size(struct comedi_cmd cmd) | |||
1719 | /* figures out what counter values to use based on command */ | 1765 | /* figures out what counter values to use based on command */ |
1720 | static void labpc_adc_timing(struct comedi_device *dev, struct comedi_cmd *cmd) | 1766 | static void labpc_adc_timing(struct comedi_device *dev, struct comedi_cmd *cmd) |
1721 | { | 1767 | { |
1722 | const int max_counter_value = 0x10000; /* max value for 16 bit counter in mode 2 */ | 1768 | /* max value for 16 bit counter in mode 2 */ |
1723 | const int min_counter_value = 2; /* min value for 16 bit counter in mode 2 */ | 1769 | const int max_counter_value = 0x10000; |
1770 | /* min value for 16 bit counter in mode 2 */ | ||
1771 | const int min_counter_value = 2; | ||
1724 | unsigned int base_period; | 1772 | unsigned int base_period; |
1725 | 1773 | ||
1726 | /* if both convert and scan triggers are TRIG_TIMER, then they both rely on counter b0 */ | 1774 | /* |
1775 | * if both convert and scan triggers are TRIG_TIMER, then they | ||
1776 | * both rely on counter b0 | ||
1777 | */ | ||
1727 | if (labpc_ai_convert_period(cmd) && labpc_ai_scan_period(cmd)) { | 1778 | if (labpc_ai_convert_period(cmd) && labpc_ai_scan_period(cmd)) { |
1728 | /* pick the lowest b0 divisor value we can (for maximum input clock speed on convert and scan counters) */ | 1779 | /* |
1780 | * pick the lowest b0 divisor value we can (for maximum input | ||
1781 | * clock speed on convert and scan counters) | ||
1782 | */ | ||
1729 | devpriv->divisor_b0 = (labpc_ai_scan_period(cmd) - 1) / | 1783 | devpriv->divisor_b0 = (labpc_ai_scan_period(cmd) - 1) / |
1730 | (LABPC_TIMER_BASE * max_counter_value) + 1; | 1784 | (LABPC_TIMER_BASE * max_counter_value) + 1; |
1731 | if (devpriv->divisor_b0 < min_counter_value) | 1785 | if (devpriv->divisor_b0 < min_counter_value) |
@@ -1775,7 +1829,10 @@ static void labpc_adc_timing(struct comedi_device *dev, struct comedi_cmd *cmd) | |||
1775 | base_period * devpriv->divisor_a0); | 1829 | base_period * devpriv->divisor_a0); |
1776 | labpc_set_ai_scan_period(cmd, | 1830 | labpc_set_ai_scan_period(cmd, |
1777 | base_period * devpriv->divisor_b1); | 1831 | base_period * devpriv->divisor_b1); |
1778 | /* if only one TRIG_TIMER is used, we can employ the generic cascaded timing functions */ | 1832 | /* |
1833 | * if only one TRIG_TIMER is used, we can employ the generic | ||
1834 | * cascaded timing functions | ||
1835 | */ | ||
1779 | } else if (labpc_ai_scan_period(cmd)) { | 1836 | } else if (labpc_ai_scan_period(cmd)) { |
1780 | unsigned int scan_period; | 1837 | unsigned int scan_period; |
1781 | 1838 | ||
@@ -1870,8 +1927,10 @@ static unsigned int labpc_eeprom_read(struct comedi_device *dev, | |||
1870 | unsigned int address) | 1927 | unsigned int address) |
1871 | { | 1928 | { |
1872 | unsigned int value; | 1929 | unsigned int value; |
1873 | const int read_instruction = 0x3; /* bits to tell eeprom to expect a read */ | 1930 | /* bits to tell eeprom to expect a read */ |
1874 | const int write_length = 8; /* 8 bit write lengths to eeprom */ | 1931 | const int read_instruction = 0x3; |
1932 | /* 8 bit write lengths to eeprom */ | ||
1933 | const int write_length = 8; | ||
1875 | 1934 | ||
1876 | /* enable read/write to eeprom */ | 1935 | /* enable read/write to eeprom */ |
1877 | devpriv->command5_bits &= ~EEPROM_EN_BIT; | 1936 | devpriv->command5_bits &= ~EEPROM_EN_BIT; |