Staging: comedi: kcomedilib: delete dio.c and get.c
Merge these two files into kcomedilib_main.c as they are tiny. This will also let us get rid of another global symbol in the future. Cc: Ian Abbott <abbotti@mev.co.uk> Cc: Frank Mori Hess <fmhess@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Greg Kroah-Hartman
parent
6b18af18d2
commit
a1525758c8
4 changed files with 64 additions and 123 deletions
|
|
@ -1,6 +1,3 @@
|
||||||
obj-$(CONFIG_COMEDI) += kcomedilib.o
|
obj-$(CONFIG_COMEDI) += kcomedilib.o
|
||||||
|
|
||||||
kcomedilib-objs := \
|
kcomedilib-objs := kcomedilib_main.o
|
||||||
dio.o \
|
|
||||||
kcomedilib_main.o \
|
|
||||||
get.o
|
|
||||||
|
|
|
||||||
|
|
@ -1,68 +0,0 @@
|
||||||
/*
|
|
||||||
kcomedilib/dio.c
|
|
||||||
implements comedi_dio_*() functions
|
|
||||||
|
|
||||||
COMEDI - Linux Control and Measurement Device Interface
|
|
||||||
Copyright (C) 2000 David A. Schleef <ds@schleef.org>
|
|
||||||
|
|
||||||
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
|
|
||||||
the Free Software Foundation; either version 2 of the License, or
|
|
||||||
(at your option) any later version.
|
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
|
||||||
along with this program; if not, write to the Free Software
|
|
||||||
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
||||||
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "../comedi.h"
|
|
||||||
#include "../comedilib.h"
|
|
||||||
|
|
||||||
#include <linux/string.h>
|
|
||||||
#include <linux/module.h>
|
|
||||||
|
|
||||||
int comedi_dio_config(void *dev, unsigned int subdev, unsigned int chan,
|
|
||||||
unsigned int io)
|
|
||||||
{
|
|
||||||
struct comedi_insn insn;
|
|
||||||
|
|
||||||
memset(&insn, 0, sizeof(insn));
|
|
||||||
insn.insn = INSN_CONFIG;
|
|
||||||
insn.n = 1;
|
|
||||||
insn.data = &io;
|
|
||||||
insn.subdev = subdev;
|
|
||||||
insn.chanspec = CR_PACK(chan, 0, 0);
|
|
||||||
|
|
||||||
return comedi_do_insn(dev, &insn);
|
|
||||||
}
|
|
||||||
EXPORT_SYMBOL(comedi_dio_config);
|
|
||||||
|
|
||||||
int comedi_dio_bitfield(void *dev, unsigned int subdev, unsigned int mask,
|
|
||||||
unsigned int *bits)
|
|
||||||
{
|
|
||||||
struct comedi_insn insn;
|
|
||||||
unsigned int data[2];
|
|
||||||
int ret;
|
|
||||||
|
|
||||||
memset(&insn, 0, sizeof(insn));
|
|
||||||
insn.insn = INSN_BITS;
|
|
||||||
insn.n = 2;
|
|
||||||
insn.data = data;
|
|
||||||
insn.subdev = subdev;
|
|
||||||
|
|
||||||
data[0] = mask;
|
|
||||||
data[1] = *bits;
|
|
||||||
|
|
||||||
ret = comedi_do_insn(dev, &insn);
|
|
||||||
|
|
||||||
*bits = data[1];
|
|
||||||
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
EXPORT_SYMBOL(comedi_dio_bitfield);
|
|
||||||
|
|
@ -1,51 +0,0 @@
|
||||||
/*
|
|
||||||
kcomedilib/get.c
|
|
||||||
a comedlib interface for kernel modules
|
|
||||||
|
|
||||||
COMEDI - Linux Control and Measurement Device Interface
|
|
||||||
Copyright (C) 1997-2000 David A. Schleef <ds@schleef.org>
|
|
||||||
|
|
||||||
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
|
|
||||||
the Free Software Foundation; either version 2 of the License, or
|
|
||||||
(at your option) any later version.
|
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
|
||||||
along with this program; if not, write to the Free Software
|
|
||||||
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
||||||
|
|
||||||
*/
|
|
||||||
|
|
||||||
#define __NO_VERSION__
|
|
||||||
#include "../comedi.h"
|
|
||||||
#include "../comedilib.h"
|
|
||||||
#include "../comedidev.h"
|
|
||||||
|
|
||||||
int comedi_find_subdevice_by_type(void *d, int type, unsigned int subd)
|
|
||||||
{
|
|
||||||
struct comedi_device *dev = (struct comedi_device *)d;
|
|
||||||
|
|
||||||
if (subd > dev->n_subdevices)
|
|
||||||
return -ENODEV;
|
|
||||||
|
|
||||||
for (; subd < dev->n_subdevices; subd++) {
|
|
||||||
if (dev->subdevices[subd].type == type)
|
|
||||||
return subd;
|
|
||||||
}
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
EXPORT_SYMBOL(comedi_find_subdevice_by_type);
|
|
||||||
|
|
||||||
int comedi_get_n_channels(void *d, unsigned int subdevice)
|
|
||||||
{
|
|
||||||
struct comedi_device *dev = (struct comedi_device *)d;
|
|
||||||
struct comedi_subdevice *s = dev->subdevices + subdevice;
|
|
||||||
|
|
||||||
return s->n_chan;
|
|
||||||
}
|
|
||||||
EXPORT_SYMBOL(comedi_get_n_channels);
|
|
||||||
|
|
@ -206,3 +206,66 @@ error:
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int comedi_dio_config(void *dev, unsigned int subdev, unsigned int chan,
|
||||||
|
unsigned int io)
|
||||||
|
{
|
||||||
|
struct comedi_insn insn;
|
||||||
|
|
||||||
|
memset(&insn, 0, sizeof(insn));
|
||||||
|
insn.insn = INSN_CONFIG;
|
||||||
|
insn.n = 1;
|
||||||
|
insn.data = &io;
|
||||||
|
insn.subdev = subdev;
|
||||||
|
insn.chanspec = CR_PACK(chan, 0, 0);
|
||||||
|
|
||||||
|
return comedi_do_insn(dev, &insn);
|
||||||
|
}
|
||||||
|
EXPORT_SYMBOL(comedi_dio_config);
|
||||||
|
|
||||||
|
int comedi_dio_bitfield(void *dev, unsigned int subdev, unsigned int mask,
|
||||||
|
unsigned int *bits)
|
||||||
|
{
|
||||||
|
struct comedi_insn insn;
|
||||||
|
unsigned int data[2];
|
||||||
|
int ret;
|
||||||
|
|
||||||
|
memset(&insn, 0, sizeof(insn));
|
||||||
|
insn.insn = INSN_BITS;
|
||||||
|
insn.n = 2;
|
||||||
|
insn.data = data;
|
||||||
|
insn.subdev = subdev;
|
||||||
|
|
||||||
|
data[0] = mask;
|
||||||
|
data[1] = *bits;
|
||||||
|
|
||||||
|
ret = comedi_do_insn(dev, &insn);
|
||||||
|
|
||||||
|
*bits = data[1];
|
||||||
|
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
EXPORT_SYMBOL(comedi_dio_bitfield);
|
||||||
|
|
||||||
|
int comedi_find_subdevice_by_type(void *d, int type, unsigned int subd)
|
||||||
|
{
|
||||||
|
struct comedi_device *dev = (struct comedi_device *)d;
|
||||||
|
|
||||||
|
if (subd > dev->n_subdevices)
|
||||||
|
return -ENODEV;
|
||||||
|
|
||||||
|
for (; subd < dev->n_subdevices; subd++) {
|
||||||
|
if (dev->subdevices[subd].type == type)
|
||||||
|
return subd;
|
||||||
|
}
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
EXPORT_SYMBOL(comedi_find_subdevice_by_type);
|
||||||
|
|
||||||
|
int comedi_get_n_channels(void *d, unsigned int subdevice)
|
||||||
|
{
|
||||||
|
struct comedi_device *dev = (struct comedi_device *)d;
|
||||||
|
struct comedi_subdevice *s = dev->subdevices + subdevice;
|
||||||
|
|
||||||
|
return s->n_chan;
|
||||||
|
}
|
||||||
|
EXPORT_SYMBOL(comedi_get_n_channels);
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue