summaryrefslogtreecommitdiffstats
path: root/drivers/staging/comedi/comedilib.h
Commit message (Collapse)AuthorAgeFilesLines
* staging: comedi: comedi_bond: handle base channel for insn_bitsIan Abbott2013-08-261-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | If a DIO subdevice has more than 32 channels, its 'insn_bits' handler is supposed to take account of the base channel from `CR_CHAN(insn->chanspec)`. (The comedi core will adjust the base channel to 0 and shift the mask and data to compensate if the subdevice has less than or equal to 32 channels.) The "comedi_bond" driver currently ignores the base channel and assumes it is 0. Replace `comedi_dio_bitfield()` in the "kcomedilib" module with `comedi_dio_bitfield2()` that takes account of the base channel, and rewrite the "comedi_bond" driver's 'insn_bits' handler (`bonding_dio_insn_bits()`) to take account of the base channel and use the new function. No other modules use `comedi_dio_bitfield()` so it is safe to replace it with `comedi_dio_bitfield2()`. The name follows that of the equivalent function in the user-space comedilib. If the base channel is non-zero and the subdevice has less than or equal to 32 channels it needs to adjust things in the same way as the comedi core (same as `parse_insn()` in "comedi_fops.c") due to most drivers ignoring the base channel. Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: comedi: comedi_bond: get INSN_CONFIG_DIO_QUERY info from horse's mouthIan Abbott2013-08-261-0/+2
| | | | | | | | | | | | | | | | | The DIO subdevice of the "comedi_bond" device attempts to remember the directions of DIO channels itself in the `io_bits` member of the subdevice, but that is only large enough for the first 32 channels and it might not be accurate anyway as changing the direction of one channel may have affected a whole group of channels and we have no idea of the initial directions before the "bonded" device was linked to the the "comedi_bond" device. It would be better to ask the bonded device for this information when handling a `INSN_CONFIG_DIO_QUERY` configuration instruction. Add new function `comedi_dio_get_config()` to the "kcomedilib" module to allow us to get the DIO direction of a channel and use it. Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: comedi: remove FSF address from boilerplate textH Hartley Sweeten2013-05-131-5/+0
| | | | | | | | | | | | | | Addresses change... Remove the paragraph with the FSF address from all the comedi source files. Also, remove the paragraph about the finding the complete GPL in the COPYING file since it's unnecessary. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Cc: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* Staging: comedi: kcomedilib: make it typesafeGreg Kroah-Hartman2010-05-111-8/+9
| | | | | | | | | | | | If we really are passing in a struct comedi_device, then say we are, don't mess around with void pointers for no reason. This also fixes up the comedi_bond.c driver, which is the only user of the kcomedilib code. Cc: Ian Abbott <abbotti@mev.co.uk> Cc: Frank Mori Hess <fmhess@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: comedi: kcomedilib: comedi_do_insn is now staticGreg Kroah-Hartman2010-05-111-3/+0
| | | | | | | | | No one else calls this function, so mark it static. Now we can strip out the unneeded functionality in here as well. Cc: Ian Abbott <abbotti@mev.co.uk> Cc: Frank Mori Hess <fmhess@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: comedi: remove unused functions from comedilib.hGreg Kroah-Hartman2010-05-111-72/+2
| | | | | | | | | | Remove the functions that are not used from this file. Now it will be easier to determine what code can be removed from kcomedilib by using sparse. Cc: Ian Abbott <abbotti@mev.co.uk> Cc: Frank Mori Hess <fmhess@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: comedi: move an include file out of comedlib.hGreg Kroah-Hartman2010-05-111-2/+0
| | | | | | | | The one .c file that needs it can properly include it. Cc: Ian Abbott <abbotti@mev.co.uk> Cc: Frank Mori Hess <fmhess@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: comedi: clean up comedilib.hGreg Kroah-Hartman2010-05-111-82/+0
| | | | | | | | Remove a whole #ifdef section that is not needed anymore. Cc: Ian Abbott <abbotti@mev.co.uk> Cc: Frank Mori Hess <fmhess@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: comedi: fix up coding style issues in comedilib.hGreg Kroah-Hartman2010-05-111-4/+4
| | | | | | This resolves some issues with comedilib.h Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: Comedi: Lindent changes to comdi driver in staging treeMithlesh Thukral2009-09-151-37/+40
| | | | | | | | | | Lindent changes to comdi driver in staging tree. This patch is followed by the checkpatch.pl error fixes. Did not make them part of this patch as the patch size is already huge. Signed-off-by: Mithlesh Thukral <mithlesh@linsyssoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: comedi: Remove comedi_krange typedefBill Pemberton2009-04-031-2/+2
| | | | | Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: comedi: Remove comedi_insn typedefBill Pemberton2009-04-031-2/+2
| | | | | Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: comedi: Remove comedi_cmd typedefBill Pemberton2009-04-031-4/+4
| | | | | Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: comedi: Remove comedi_trig typedefBill Pemberton2009-04-031-4/+4
| | | | | Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: comedi: Remove lsampl_t and sampl_t typedefsBill Pemberton2009-04-031-7/+7
| | | | | Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: comedi: Remove comedi_t typedefBill Pemberton2009-04-031-45/+43
| | | | | Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: comedi: fix build error in comedilib.hGreg Kroah-Hartman2009-01-061-1/+1
| | | | | | | | | | | If anyone included this file, it would break the build. This patch fixes the issue. Cc: David Schleef <ds@schleef.org> Cc: Frank Mori Hess <fmhess@users.sourceforge.net> Cc: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: comedi: fix up a lot of checkpatch.pl warningsGreg Kroah-Hartman2009-01-061-52/+52
| | | | | | | | | Only clean up some of the easier ones in the .h files Cc: Ian Abbott <abbotti@mev.co.uk> Cc: Frank Mori Hess <fmhess@users.sourceforge.net> Cc: David Schleef <ds@schleef.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: add comedi coreDavid Schleef2009-01-061-0/+192
This adds the Comedi core to the staging tree. This is a data acquision infrastructure for Linux, providing a common interface for these types of drivers. Taken directly from the comedi git tree, with only minor tweaks by Greg to get it to build properly within the kernel tree. From: David Schleef <ds@schleef.org> Cc: Ian Abbott <abbotti@mev.co.uk> Cc: Shawn Bohrer <shawn.bohrer@gmail.com> Signed-off-by: Frank Mori Hess <fmhess@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
OpenPOWER on IntegriCloud