Commit 8c0740ca authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

staging: comedi: ni_pcidio: fix block comments

Fix the checkpatch.pl issues:
WARNING: Block comments use * on subsequent lines
WARNING: Block comments use a trailing */ on a separate line
Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 28e0721e
/* /*
comedi/drivers/ni_pcidio.c * Comedi driver for National Instruments PCI-DIO-32HS
driver for National Instruments PCI-DIO-32HS *
* COMEDI - Linux Control and Measurement Device Interface
COMEDI - Linux Control and Measurement Device Interface * Copyright (C) 1999,2002 David A. Schleef <ds@schleef.org>
Copyright (C) 1999,2002 David A. Schleef <ds@schleef.org> *
* 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_pcidio * Driver: ni_pcidio
Description: National Instruments PCI-DIO32HS, PCI-6533 * Description: National Instruments PCI-DIO32HS, PCI-6533
Author: ds * Author: ds
Status: works * Status: works
Devices: [National Instruments] PCI-DIO-32HS (ni_pcidio) * Devices: [National Instruments] PCI-DIO-32HS (ni_pcidio)
[National Instruments] PXI-6533, PCI-6533 (pxi-6533) * [National Instruments] PXI-6533, PCI-6533 (pxi-6533)
[National Instruments] PCI-6534 (pci-6534) * [National Instruments] PCI-6534 (pci-6534)
Updated: Mon, 09 Jan 2012 14:27:23 +0000 * Updated: Mon, 09 Jan 2012 14:27:23 +0000
*
The DIO32HS board appears as one subdevice, with 32 channels. * The DIO32HS board appears as one subdevice, with 32 channels. Each
Each channel is individually I/O configurable. The channel order * channel is individually I/O configurable. The channel order is 0=A0,
is 0=A0, 1=A1, 2=A2, ... 8=B0, 16=C0, 24=D0. The driver only * 1=A1, 2=A2, ... 8=B0, 16=C0, 24=D0. The driver only supports simple
supports simple digital I/O; no handshaking is supported. * digital I/O; no handshaking is supported.
*
DMA mostly works for the PCI-DIO32HS, but only in timed input mode. * DMA mostly works for the PCI-DIO32HS, but only in timed input mode.
*
The PCI-DIO-32HS/PCI-6533 has a configurable external trigger. Setting * The PCI-DIO-32HS/PCI-6533 has a configurable external trigger. Setting
scan_begin_arg to 0 or CR_EDGE triggers on the leading edge. Setting * scan_begin_arg to 0 or CR_EDGE triggers on the leading edge. Setting
scan_begin_arg to CR_INVERT or (CR_EDGE | CR_INVERT) triggers on the * scan_begin_arg to CR_INVERT or (CR_EDGE | CR_INVERT) triggers on the
trailing edge. * trailing edge.
*
This driver could be easily modified to support AT-MIO32HS and * This driver could be easily modified to support AT-MIO32HS and AT-MIO96.
AT-MIO96. *
* The PCI-6534 requires a firmware upload after power-up to work, the
The PCI-6534 requires a firmware upload after power-up to work, the * firmware data and instructions for loading it with comedi_config
firmware data and instructions for loading it with comedi_config * it are contained in the comedi_nonfree_firmware tarball available from
it are contained in the * http://www.comedi.org
comedi_nonfree_firmware tarball available from http://www.comedi.org */
*/
#define USE_DMA #define USE_DMA
...@@ -649,8 +648,10 @@ static int ni_pcidio_cmd(struct comedi_device *dev, struct comedi_subdevice *s) ...@@ -649,8 +648,10 @@ static int ni_pcidio_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
writeb(1, dev->mmio + AckDelay); writeb(1, dev->mmio + AckDelay);
writeb(0x0b, dev->mmio + AckNotDelay); writeb(0x0b, dev->mmio + AckNotDelay);
writeb(0x01, dev->mmio + Data1Delay); writeb(0x01, dev->mmio + Data1Delay);
/* manual, page 4-5: ClockSpeed comment is incorrectly listed /*
* on DAQOptions */ * manual, page 4-5:
* ClockSpeed comment is incorrectly listed on DAQOptions
*/
writew(0, dev->mmio + ClockSpeed); writew(0, dev->mmio + ClockSpeed);
writeb(0, dev->mmio + DAQOptions); writeb(0, dev->mmio + DAQOptions);
} else { } else {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment