openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: comedi: ni_atmio16d: fix block comments 

Fix the checkpatch.pl issues:
WARNING: Block comments use * on subsequent lines

Move the configuration options comment into the comedi driver comment
block. That's were they typically are listed.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2016-06-20 11:39:34 -07:00 committed by Greg Kroah-Hartman
parent 44a678b966
commit 28e0721e33
1 changed files with 47 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
drivers/staging/comedi/drivers/ni_atmio16d.c
View File

@ -1,25 +1,41 @@
/* /*
comedi/drivers/ni_atmio16d.c * Comedi driver for National Instruments AT-MIO16D board
Hardware driver for National Instruments AT-MIO16D board * Copyright (C) 2000 Chris R. Baugher <baugher@enteract.com>
Copyright (C) 2000 Chris R. Baugher <baugher@enteract.com> *
* This program is free software; you can redistribute it and/or modify
This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by
it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or
the Free Software Foundation; either version 2 of the License, or * (at your option) any later version.
(at your option) any later version. *
* This program is distributed in the hope that it will be useful,
This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of
but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details.
GNU General Public License for more details.
*/ */
/* /*
Driver: ni_atmio16d * Driver: ni_atmio16d
Description: National Instruments AT-MIO-16D * Description: National Instruments AT-MIO-16D
Author: Chris R. Baugher <baugher@enteract.com> * Author: Chris R. Baugher <baugher@enteract.com>
Status: unknown * Status: unknown
Devices: [National Instruments] AT-MIO-16 (atmio16), AT-MIO-16D (atmio16d) * Devices: [National Instruments] AT-MIO-16 (atmio16), AT-MIO-16D (atmio16d)
*/ *
* Configuration options:
* [0] - I/O port
* [1] - MIO irq (0 == no irq; or 3,4,5,6,7,9,10,11,12,14,15)
* [2] - DIO irq (0 == no irq; or 3,4,5,6,7,9)
* [3] - DMA1 channel (0 == no DMA; or 5,6,7)
* [4] - DMA2 channel (0 == no DMA; or 5,6,7)
* [5] - a/d mux (0=differential; 1=single)
* [6] - a/d range (0=bipolar10; 1=bipolar5; 2=unipolar10)
* [7] - dac0 range (0=bipolar; 1=unipolar)
* [8] - dac0 reference (0=internal; 1=external)
* [9] - dac0 coding (0=2's comp; 1=straight binary)
* [10] - dac1 range (same as dac0 options)
* [11] - dac1 reference (same as dac0 options)
* [12] - dac1 coding (same as dac0 options)
*/
/* /*
* I must give credit here to Michal Dobes <dobes@tesnet.cz> who * I must give credit here to Michal Dobes <dobes@tesnet.cz> who
* wrote the driver for Advantec's pcl812 boards. I used the interrupt * wrote the driver for Advantec's pcl812 boards. I used the interrupt
@ -295,8 +311,10 @@ static int atmio16d_ai_cmd(struct comedi_device *dev,
unsigned int sample_count, tmp, chan, gain; unsigned int sample_count, tmp, chan, gain;
int i; int i;
/* This is slowly becoming a working command interface. * /*
* It is still uber-experimental */ * This is slowly becoming a working command interface.
* It is still uber-experimental
*/
reset_counters(dev); reset_counters(dev);
@ -322,9 +340,10 @@ static int atmio16d_ai_cmd(struct comedi_device *dev,
outw(tmp, dev->iobase + MUX_GAIN_REG); outw(tmp, dev->iobase + MUX_GAIN_REG);
} }
/* Now program the sample interval timer */ /*
/* Figure out which clock to use then get an * Now program the sample interval timer.
* appropriate timer value */ * Figure out which clock to use then get an appropriate timer value.
*/
if (cmd->convert_arg < 65536000) { if (cmd->convert_arg < 65536000) {
base_clock = CLOCK_1_MHZ; base_clock = CLOCK_1_MHZ;
timer = cmd->convert_arg / 1000; timer = cmd->convert_arg / 1000;
@ -386,9 +405,10 @@ static int atmio16d_ai_cmd(struct comedi_device *dev,
outw(devpriv->com_reg_1_state, dev->iobase + COM_REG_1); outw(devpriv->com_reg_1_state, dev->iobase + COM_REG_1);
} }
/* Program the scan interval timer ONLY IF SCANNING IS ENABLED */ /*
/* Figure out which clock to use then get an * Program the scan interval timer ONLY IF SCANNING IS ENABLED.
* appropriate timer value */ * Figure out which clock to use then get an appropriate timer value.
*/
if (cmd->chanlist_len > 1) { if (cmd->chanlist_len > 1) {
if (cmd->scan_begin_arg < 65536000) { if (cmd->scan_begin_arg < 65536000) {
base_clock = CLOCK_1_MHZ; base_clock = CLOCK_1_MHZ;
@ -566,38 +586,6 @@ static int atmio16d_dio_insn_config(struct comedi_device *dev,
return insn->n; return insn->n;
} }
/*
options[0] - I/O port
options[1] - MIO irq
0 == no irq
N == irq N {3,4,5,6,7,9,10,11,12,14,15}
options[2] - DIO irq
0 == no irq
N == irq N {3,4,5,6,7,9}
options[3] - DMA1 channel
0 == no DMA
N == DMA N {5,6,7}
options[4] - DMA2 channel
0 == no DMA
N == DMA N {5,6,7}
options[5] - a/d mux
0=differential, 1=single
options[6] - a/d range
0=bipolar10, 1=bipolar5, 2=unipolar10
options[7] - dac0 range
0=bipolar, 1=unipolar
options[8] - dac0 reference
0=internal, 1=external
options[9] - dac0 coding
0=2's comp, 1=straight binary
options[10] - dac1 range
options[11] - dac1 reference
options[12] - dac1 coding
*/
static int atmio16d_attach(struct comedi_device *dev, static int atmio16d_attach(struct comedi_device *dev,
struct comedi_devconfig *it) struct comedi_devconfig *it)
{ {