Skip to content

L
linux
Commit 34c43922 authored by Bill Pemberton's avatar Bill Pemberton Committed by Greg Kroah-Hartman
Browse files
Options

Staging: comedi: Remove comedi_subdevice typedef 

Signed-off-by: default avatarBill Pemberton <wfp5p@virginia.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 71b5f4f1
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1930 additions and 1923 deletions
drivers/staging/comedi/comedi_fops.c
View file @ 34c43922
...@@ -86,8 +86,8 @@ static int do_insnlist_ioctl(struct comedi_device *dev, void *arg, void *file); ...@@ -86,8 +86,8 @@ static int do_insnlist_ioctl(struct comedi_device *dev, void *arg, void *file);
static int do_insn_ioctl(struct comedi_device *dev, void *arg, void *file); static int do_insn_ioctl(struct comedi_device *dev, void *arg, void *file);
static int do_poll_ioctl(struct comedi_device *dev, unsigned int subd, void *file); static int do_poll_ioctl(struct comedi_device *dev, unsigned int subd, void *file);
extern void do_become_nonbusy(struct comedi_device *dev, comedi_subdevice *s); extern void do_become_nonbusy(struct comedi_device *dev, struct comedi_subdevice *s);
static int do_cancel(struct comedi_device *dev, comedi_subdevice *s); static int do_cancel(struct comedi_device *dev, struct comedi_subdevice *s);
static int comedi_fasync(int fd, struct file *file, int on); static int comedi_fasync(int fd, struct file *file, int on);
...@@ -276,7 +276,7 @@ static int do_bufconfig_ioctl(struct comedi_device *dev, void *arg) ...@@ -276,7 +276,7 @@ static int do_bufconfig_ioctl(struct comedi_device *dev, void *arg)
{ {
comedi_bufconfig bc; comedi_bufconfig bc;
comedi_async *async; comedi_async *async;
comedi_subdevice *s; struct comedi_subdevice *s;
int ret = 0; int ret = 0;
if (copy_from_user(&bc, arg, sizeof(comedi_bufconfig))) if (copy_from_user(&bc, arg, sizeof(comedi_bufconfig)))
...@@ -367,9 +367,9 @@ static int do_devinfo_ioctl(struct comedi_device *dev, comedi_devinfo *arg, ...@@ -367,9 +367,9 @@ static int do_devinfo_ioctl(struct comedi_device *dev, comedi_devinfo *arg,
const unsigned minor = iminor(file->f_dentry->d_inode); const unsigned minor = iminor(file->f_dentry->d_inode);
struct comedi_device_file_info *dev_file_info = struct comedi_device_file_info *dev_file_info =
comedi_get_device_file_info(minor); comedi_get_device_file_info(minor);
comedi_subdevice *read_subdev = struct comedi_subdevice *read_subdev =
comedi_get_read_subdevice(dev_file_info); comedi_get_read_subdevice(dev_file_info);
comedi_subdevice *write_subdev = struct comedi_subdevice *write_subdev =
comedi_get_write_subdevice(dev_file_info); comedi_get_write_subdevice(dev_file_info);
memset(&devinfo, 0, sizeof(devinfo)); memset(&devinfo, 0, sizeof(devinfo));
...@@ -415,7 +415,7 @@ static int do_subdinfo_ioctl(struct comedi_device *dev, comedi_subdinfo *arg, ...@@ -415,7 +415,7 @@ static int do_subdinfo_ioctl(struct comedi_device *dev, comedi_subdinfo *arg,
{ {
int ret, i; int ret, i;
comedi_subdinfo *tmp, *us; comedi_subdinfo *tmp, *us;
comedi_subdevice *s; struct comedi_subdevice *s;
tmp = kcalloc(dev->n_subdevices, sizeof(comedi_subdinfo), GFP_KERNEL); tmp = kcalloc(dev->n_subdevices, sizeof(comedi_subdinfo), GFP_KERNEL);
if (!tmp) if (!tmp)
...@@ -492,7 +492,7 @@ static int do_subdinfo_ioctl(struct comedi_device *dev, comedi_subdinfo *arg, ...@@ -492,7 +492,7 @@ static int do_subdinfo_ioctl(struct comedi_device *dev, comedi_subdinfo *arg,
*/ */
static int do_chaninfo_ioctl(struct comedi_device *dev, comedi_chaninfo *arg) static int do_chaninfo_ioctl(struct comedi_device *dev, comedi_chaninfo *arg)
{ {
comedi_subdevice *s; struct comedi_subdevice *s;
comedi_chaninfo it; comedi_chaninfo it;
if (copy_from_user(&it, arg, sizeof(comedi_chaninfo))) if (copy_from_user(&it, arg, sizeof(comedi_chaninfo)))
...@@ -557,7 +557,7 @@ static int do_chaninfo_ioctl(struct comedi_device *dev, comedi_chaninfo *arg) ...@@ -557,7 +557,7 @@ static int do_chaninfo_ioctl(struct comedi_device *dev, comedi_chaninfo *arg)
static int do_bufinfo_ioctl(struct comedi_device *dev, void *arg) static int do_bufinfo_ioctl(struct comedi_device *dev, void *arg)
{ {
comedi_bufinfo bi; comedi_bufinfo bi;
comedi_subdevice *s; struct comedi_subdevice *s;
comedi_async *async; comedi_async *async;
if (copy_from_user(&bi, arg, sizeof(comedi_bufinfo))) if (copy_from_user(&bi, arg, sizeof(comedi_bufinfo)))
...@@ -760,7 +760,7 @@ static int check_insn_config_length(comedi_insn *insn, unsigned int *data) ...@@ -760,7 +760,7 @@ static int check_insn_config_length(comedi_insn *insn, unsigned int *data)
static int parse_insn(struct comedi_device *dev, comedi_insn *insn, unsigned int *data, static int parse_insn(struct comedi_device *dev, comedi_insn *insn, unsigned int *data,
void *file) void *file)
{ {
comedi_subdevice *s; struct comedi_subdevice *s;
int ret = 0; int ret = 0;
int i; int i;
...@@ -978,7 +978,7 @@ static int do_insn_ioctl(struct comedi_device *dev, void *arg, void *file) ...@@ -978,7 +978,7 @@ static int do_insn_ioctl(struct comedi_device *dev, void *arg, void *file)
static int do_cmd_ioctl(struct comedi_device *dev, void *arg, void *file) static int do_cmd_ioctl(struct comedi_device *dev, void *arg, void *file)
{ {
comedi_cmd user_cmd; comedi_cmd user_cmd;
comedi_subdevice *s; struct comedi_subdevice *s;
comedi_async *async; comedi_async *async;
int ret = 0; int ret = 0;
unsigned int *chanlist_saver = NULL; unsigned int *chanlist_saver = NULL;
...@@ -1132,7 +1132,7 @@ static int do_cmd_ioctl(struct comedi_device *dev, void *arg, void *file) ...@@ -1132,7 +1132,7 @@ static int do_cmd_ioctl(struct comedi_device *dev, void *arg, void *file)
static int do_cmdtest_ioctl(struct comedi_device *dev, void *arg, void *file) static int do_cmdtest_ioctl(struct comedi_device *dev, void *arg, void *file)
{ {
comedi_cmd user_cmd; comedi_cmd user_cmd;
comedi_subdevice *s; struct comedi_subdevice *s;
int ret = 0; int ret = 0;
unsigned int *chanlist = NULL; unsigned int *chanlist = NULL;
unsigned int *chanlist_saver = NULL; unsigned int *chanlist_saver = NULL;
...@@ -1231,7 +1231,7 @@ static int do_lock_ioctl(struct comedi_device *dev, unsigned int arg, void *file ...@@ -1231,7 +1231,7 @@ static int do_lock_ioctl(struct comedi_device *dev, unsigned int arg, void *file
{ {
int ret = 0; int ret = 0;
unsigned long flags; unsigned long flags;
comedi_subdevice *s; struct comedi_subdevice *s;
if (arg >= dev->n_subdevices) if (arg >= dev->n_subdevices)
return -EINVAL; return -EINVAL;
...@@ -1273,7 +1273,7 @@ static int do_lock_ioctl(struct comedi_device *dev, unsigned int arg, void *file ...@@ -1273,7 +1273,7 @@ static int do_lock_ioctl(struct comedi_device *dev, unsigned int arg, void *file
*/ */
static int do_unlock_ioctl(struct comedi_device *dev, unsigned int arg, void *file) static int do_unlock_ioctl(struct comedi_device *dev, unsigned int arg, void *file)
{ {
comedi_subdevice *s; struct comedi_subdevice *s;
if (arg >= dev->n_subdevices) if (arg >= dev->n_subdevices)
return -EINVAL; return -EINVAL;
...@@ -1313,7 +1313,7 @@ static int do_unlock_ioctl(struct comedi_device *dev, unsigned int arg, void *fi ...@@ -1313,7 +1313,7 @@ static int do_unlock_ioctl(struct comedi_device *dev, unsigned int arg, void *fi
*/ */
static int do_cancel_ioctl(struct comedi_device *dev, unsigned int arg, void *file) static int do_cancel_ioctl(struct comedi_device *dev, unsigned int arg, void *file)
{ {
comedi_subdevice *s; struct comedi_subdevice *s;
if (arg >= dev->n_subdevices) if (arg >= dev->n_subdevices)
return -EINVAL; return -EINVAL;
...@@ -1349,7 +1349,7 @@ static int do_cancel_ioctl(struct comedi_device *dev, unsigned int arg, void *fi ...@@ -1349,7 +1349,7 @@ static int do_cancel_ioctl(struct comedi_device *dev, unsigned int arg, void *fi
*/ */
static int do_poll_ioctl(struct comedi_device *dev, unsigned int arg, void *file) static int do_poll_ioctl(struct comedi_device *dev, unsigned int arg, void *file)
{ {
comedi_subdevice *s; struct comedi_subdevice *s;
if (arg >= dev->n_subdevices) if (arg >= dev->n_subdevices)
return -EINVAL; return -EINVAL;
...@@ -1370,7 +1370,7 @@ static int do_poll_ioctl(struct comedi_device *dev, unsigned int arg, void *file ...@@ -1370,7 +1370,7 @@ static int do_poll_ioctl(struct comedi_device *dev, unsigned int arg, void *file
return -EINVAL; return -EINVAL;
} }
static int do_cancel(struct comedi_device *dev, comedi_subdevice *s) static int do_cancel(struct comedi_device *dev, struct comedi_subdevice *s)
{ {
int ret = 0; int ret = 0;
...@@ -1411,7 +1411,7 @@ static int comedi_mmap(struct file *file, struct vm_area_struct *vma) ...@@ -1411,7 +1411,7 @@ static int comedi_mmap(struct file *file, struct vm_area_struct *vma)
int n_pages; int n_pages;
int i; int i;
int retval; int retval;
comedi_subdevice *s; struct comedi_subdevice *s;
mutex_lock(&dev->mutex); mutex_lock(&dev->mutex);
if (!dev->attached) { if (!dev->attached) {
...@@ -1481,8 +1481,8 @@ static unsigned int comedi_poll(struct file *file, poll_table *wait) ...@@ -1481,8 +1481,8 @@ static unsigned int comedi_poll(struct file *file, poll_table *wait)
struct comedi_device_file_info *dev_file_info = struct comedi_device_file_info *dev_file_info =
comedi_get_device_file_info(minor); comedi_get_device_file_info(minor);
struct comedi_device *dev = dev_file_info->device; struct comedi_device *dev = dev_file_info->device;
comedi_subdevice *read_subdev; struct comedi_subdevice *read_subdev;
comedi_subdevice *write_subdev; struct comedi_subdevice *write_subdev;
mutex_lock(&dev->mutex); mutex_lock(&dev->mutex);
if (!dev->attached) { if (!dev->attached) {
...@@ -1523,7 +1523,7 @@ static unsigned int comedi_poll(struct file *file, poll_table *wait) ...@@ -1523,7 +1523,7 @@ static unsigned int comedi_poll(struct file *file, poll_table *wait)
static ssize_t comedi_write(struct file *file, const char *buf, size_t nbytes, static ssize_t comedi_write(struct file *file, const char *buf, size_t nbytes,
loff_t *offset) loff_t *offset)
{ {
comedi_subdevice *s; struct comedi_subdevice *s;
comedi_async *async; comedi_async *async;
int n, m, count = 0, retval = 0; int n, m, count = 0, retval = 0;
DECLARE_WAITQUEUE(wait, current); DECLARE_WAITQUEUE(wait, current);
...@@ -1625,7 +1625,7 @@ static ssize_t comedi_write(struct file *file, const char *buf, size_t nbytes, ...@@ -1625,7 +1625,7 @@ static ssize_t comedi_write(struct file *file, const char *buf, size_t nbytes,
static ssize_t comedi_read(struct file *file, char *buf, size_t nbytes, static ssize_t comedi_read(struct file *file, char *buf, size_t nbytes,
loff_t *offset) loff_t *offset)
{ {
comedi_subdevice *s; struct comedi_subdevice *s;
comedi_async *async; comedi_async *async;
int n, m, count = 0, retval = 0; int n, m, count = 0, retval = 0;
DECLARE_WAITQUEUE(wait, current); DECLARE_WAITQUEUE(wait, current);
...@@ -1733,7 +1733,7 @@ static ssize_t comedi_read(struct file *file, char *buf, size_t nbytes, ...@@ -1733,7 +1733,7 @@ static ssize_t comedi_read(struct file *file, char *buf, size_t nbytes,
/* /*
This function restores a subdevice to an idle state. This function restores a subdevice to an idle state.
*/ */
void do_become_nonbusy(struct comedi_device *dev, comedi_subdevice *s) void do_become_nonbusy(struct comedi_device *dev, struct comedi_subdevice *s)
{ {
comedi_async *async = s->async; comedi_async *async = s->async;
...@@ -1833,7 +1833,7 @@ static int comedi_close(struct inode *inode, struct file *file) ...@@ -1833,7 +1833,7 @@ static int comedi_close(struct inode *inode, struct file *file)
struct comedi_device_file_info *dev_file_info = struct comedi_device_file_info *dev_file_info =
comedi_get_device_file_info(minor); comedi_get_device_file_info(minor);
struct comedi_device *dev = dev_file_info->device; struct comedi_device *dev = dev_file_info->device;
comedi_subdevice *s = NULL; struct comedi_subdevice *s = NULL;
int i; int i;
mutex_lock(&dev->mutex); mutex_lock(&dev->mutex);
...@@ -2006,7 +2006,7 @@ void comedi_error(const struct comedi_device *dev, const char *s) ...@@ -2006,7 +2006,7 @@ void comedi_error(const struct comedi_device *dev, const char *s)
s); s);
} }
void comedi_event(struct comedi_device *dev, comedi_subdevice *s) void comedi_event(struct comedi_device *dev, struct comedi_subdevice *s)
{ {
comedi_async *async = s->async; comedi_async *async = s->async;
unsigned runflags = 0; unsigned runflags = 0;
...@@ -2067,7 +2067,7 @@ void comedi_event(struct comedi_device *dev, comedi_subdevice *s) ...@@ -2067,7 +2067,7 @@ void comedi_event(struct comedi_device *dev, comedi_subdevice *s)
s->async->events = 0; s->async->events = 0;
} }
void comedi_set_subdevice_runflags(comedi_subdevice *s, unsigned mask, void comedi_set_subdevice_runflags(struct comedi_subdevice *s, unsigned mask,
unsigned bits) unsigned bits)
{ {
unsigned long flags; unsigned long flags;
...@@ -2078,7 +2078,7 @@ void comedi_set_subdevice_runflags(comedi_subdevice *s, unsigned mask, ...@@ -2078,7 +2078,7 @@ void comedi_set_subdevice_runflags(comedi_subdevice *s, unsigned mask,
comedi_spin_unlock_irqrestore(&s->spin_lock, flags); comedi_spin_unlock_irqrestore(&s->spin_lock, flags);
} }
unsigned comedi_get_subdevice_runflags(comedi_subdevice *s) unsigned comedi_get_subdevice_runflags(struct comedi_subdevice *s)
{ {
unsigned long flags; unsigned long flags;
unsigned runflags; unsigned runflags;
...@@ -2091,7 +2091,7 @@ unsigned comedi_get_subdevice_runflags(comedi_subdevice *s) ...@@ -2091,7 +2091,7 @@ unsigned comedi_get_subdevice_runflags(comedi_subdevice *s)
static int is_device_busy(struct comedi_device *dev) static int is_device_busy(struct comedi_device *dev)
{ {
comedi_subdevice *s; struct comedi_subdevice *s;
int i; int i;
if (!dev->attached) if (!dev->attached)
...@@ -2193,7 +2193,7 @@ void comedi_free_board_minor(unsigned minor) ...@@ -2193,7 +2193,7 @@ void comedi_free_board_minor(unsigned minor)
} }
} }
int comedi_alloc_subdevice_minor(struct comedi_device *dev, comedi_subdevice *s) int comedi_alloc_subdevice_minor(struct comedi_device *dev, struct comedi_subdevice *s)
{ {
unsigned long flags; unsigned long flags;
struct comedi_device_file_info *info; struct comedi_device_file_info *info;
...@@ -2231,7 +2231,7 @@ int comedi_alloc_subdevice_minor(struct comedi_device *dev, comedi_subdevice *s) ...@@ -2231,7 +2231,7 @@ int comedi_alloc_subdevice_minor(struct comedi_device *dev, comedi_subdevice *s)
return i; return i;
} }
void comedi_free_subdevice_minor(comedi_subdevice *s) void comedi_free_subdevice_minor(struct comedi_subdevice *s)
{ {
unsigned long flags; unsigned long flags;
struct comedi_device_file_info *info; struct comedi_device_file_info *info;
......
drivers/staging/comedi/comedidev.h
View file @ 34c43922
...@@ -121,7 +121,6 @@ ...@@ -121,7 +121,6 @@
#define COMEDI_NUM_BOARD_MINORS 0x30 #define COMEDI_NUM_BOARD_MINORS 0x30
#define COMEDI_FIRST_SUBDEVICE_MINOR COMEDI_NUM_BOARD_MINORS #define COMEDI_FIRST_SUBDEVICE_MINOR COMEDI_NUM_BOARD_MINORS
typedef struct comedi_subdevice_struct comedi_subdevice;
typedef struct comedi_async_struct comedi_async; typedef struct comedi_async_struct comedi_async;
typedef struct comedi_driver_struct comedi_driver; typedef struct comedi_driver_struct comedi_driver;
typedef struct comedi_lrange_struct comedi_lrange; typedef struct comedi_lrange_struct comedi_lrange;
...@@ -131,7 +130,7 @@ typedef struct device device_create_result_type; ...@@ -131,7 +130,7 @@ typedef struct device device_create_result_type;
#define COMEDI_DEVICE_CREATE(cs, parent, devt, drvdata, device, fmt...) \ #define COMEDI_DEVICE_CREATE(cs, parent, devt, drvdata, device, fmt...) \
device_create(cs, ((parent) ? (parent) : (device)), devt, drvdata, fmt) device_create(cs, ((parent) ? (parent) : (device)), devt, drvdata, fmt)
struct comedi_subdevice_struct { struct comedi_subdevice {
struct comedi_device *device; struct comedi_device *device;
int type; int type;
int n_chan; int n_chan;
...@@ -162,27 +161,27 @@ struct comedi_subdevice_struct { ...@@ -162,27 +161,27 @@ struct comedi_subdevice_struct {
unsigned int *chanlist; /* driver-owned chanlist (not used) */ unsigned int *chanlist; /* driver-owned chanlist (not used) */
int (*insn_read) (struct comedi_device *, comedi_subdevice *, comedi_insn *, int (*insn_read) (struct comedi_device *, struct comedi_subdevice *, comedi_insn *,
unsigned int *); unsigned int *);
int (*insn_write) (struct comedi_device *, comedi_subdevice *, comedi_insn *, int (*insn_write) (struct comedi_device *, struct comedi_subdevice *, comedi_insn *,
unsigned int *); unsigned int *);
int (*insn_bits) (struct comedi_device *, comedi_subdevice *, comedi_insn *, int (*insn_bits) (struct comedi_device *, struct comedi_subdevice *, comedi_insn *,
unsigned int *); unsigned int *);
int (*insn_config) (struct comedi_device *, comedi_subdevice *, comedi_insn *, int (*insn_config) (struct comedi_device *, struct comedi_subdevice *, comedi_insn *,
unsigned int *); unsigned int *);
int (*do_cmd) (struct comedi_device *, comedi_subdevice *); int (*do_cmd) (struct comedi_device *, struct comedi_subdevice *);
int (*do_cmdtest) (struct comedi_device *, comedi_subdevice *, comedi_cmd *); int (*do_cmdtest) (struct comedi_device *, struct comedi_subdevice *, comedi_cmd *);
int (*poll) (struct comedi_device *, comedi_subdevice *); int (*poll) (struct comedi_device *, struct comedi_subdevice *);
int (*cancel) (struct comedi_device *, comedi_subdevice *); int (*cancel) (struct comedi_device *, struct comedi_subdevice *);
/* int (*do_lock)(struct comedi_device *,comedi_subdevice *); */ /* int (*do_lock)(struct comedi_device *,struct comedi_subdevice *); */
/* int (*do_unlock)(struct comedi_device *,comedi_subdevice *); */ /* int (*do_unlock)(struct comedi_device *,struct comedi_subdevice *); */
/* called when the buffer changes */ /* called when the buffer changes */
int (*buf_change) (struct comedi_device *dev, comedi_subdevice *s, int (*buf_change) (struct comedi_device *dev, struct comedi_subdevice *s,
unsigned long new_size); unsigned long new_size);
void (*munge) (struct comedi_device *dev, comedi_subdevice *s, void *data, void (*munge) (struct comedi_device *dev, struct comedi_subdevice *s, void *data,
unsigned int num_bytes, unsigned int start_chan_index); unsigned int num_bytes, unsigned int start_chan_index);
enum dma_data_direction async_dma_dir; enum dma_data_direction async_dma_dir;
...@@ -198,7 +197,7 @@ struct comedi_buf_page { ...@@ -198,7 +197,7 @@ struct comedi_buf_page {
}; };
struct comedi_async_struct { struct comedi_async_struct {
comedi_subdevice *subdevice; struct comedi_subdevice *subdevice;
void *prealloc_buf; /* pre-allocated buffer */ void *prealloc_buf; /* pre-allocated buffer */
unsigned int prealloc_bufsz; /* buffer size, in bytes */ unsigned int prealloc_bufsz; /* buffer size, in bytes */
...@@ -237,7 +236,7 @@ struct comedi_async_struct { ...@@ -237,7 +236,7 @@ struct comedi_async_struct {
int (*cb_func) (unsigned int flags, void *); int (*cb_func) (unsigned int flags, void *);
void *cb_arg; void *cb_arg;
int (*inttrig) (struct comedi_device *dev, comedi_subdevice *s, int (*inttrig) (struct comedi_device *dev, struct comedi_subdevice *s,
unsigned int x); unsigned int x);
}; };
...@@ -277,14 +276,14 @@ struct comedi_device { ...@@ -277,14 +276,14 @@ struct comedi_device {
int in_request_module; int in_request_module;
int n_subdevices; int n_subdevices;
comedi_subdevice *subdevices; struct comedi_subdevice *subdevices;
/* dumb */ /* dumb */
unsigned long iobase; unsigned long iobase;
unsigned int irq; unsigned int irq;
comedi_subdevice *read_subdev; struct comedi_subdevice *read_subdev;
comedi_subdevice *write_subdev; struct comedi_subdevice *write_subdev;
struct fasync_struct *async_queue; struct fasync_struct *async_queue;
...@@ -294,8 +293,8 @@ struct comedi_device { ...@@ -294,8 +293,8 @@ struct comedi_device {
struct comedi_device_file_info { struct comedi_device_file_info {
struct comedi_device *device; struct comedi_device *device;
comedi_subdevice *read_subdevice; struct comedi_subdevice *read_subdevice;
comedi_subdevice *write_subdevice; struct comedi_subdevice *write_subdevice;
}; };
#ifdef CONFIG_COMEDI_DEBUG #ifdef CONFIG_COMEDI_DEBUG
...@@ -308,7 +307,7 @@ static const int comedi_debug; ...@@ -308,7 +307,7 @@ static const int comedi_debug;
* function prototypes * function prototypes
*/ */
void comedi_event(struct comedi_device *dev, comedi_subdevice *s); void comedi_event(struct comedi_device *dev, struct comedi_subdevice *s);
void comedi_error(const struct comedi_device *dev, const char *s); void comedi_error(const struct comedi_device *dev, const char *s);
/* we can expand the number of bits used to encode devices/subdevices into /* we can expand the number of bits used to encode devices/subdevices into
...@@ -323,7 +322,7 @@ static const unsigned COMEDI_SUBDEVICE_MINOR_OFFSET = 1; ...@@ -323,7 +322,7 @@ static const unsigned COMEDI_SUBDEVICE_MINOR_OFFSET = 1;
struct comedi_device_file_info *comedi_get_device_file_info(unsigned minor); struct comedi_device_file_info *comedi_get_device_file_info(unsigned minor);
static inline comedi_subdevice *comedi_get_read_subdevice( static inline struct comedi_subdevice *comedi_get_read_subdevice(
const struct comedi_device_file_info *info) const struct comedi_device_file_info *info)
{ {
if (info->read_subdevice) if (info->read_subdevice)
...@@ -333,7 +332,7 @@ static inline comedi_subdevice *comedi_get_read_subdevice( ...@@ -333,7 +332,7 @@ static inline comedi_subdevice *comedi_get_read_subdevice(
return info->device->read_subdev; return info->device->read_subdev;
} }
static inline comedi_subdevice *comedi_get_write_subdevice( static inline struct comedi_subdevice *comedi_get_write_subdevice(
const struct comedi_device_file_info *info) const struct comedi_device_file_info *info)
{ {
if (info->write_subdevice) if (info->write_subdevice)
...@@ -353,7 +352,7 @@ void cleanup_polling(void); ...@@ -353,7 +352,7 @@ void cleanup_polling(void);
void start_polling(struct comedi_device *); void start_polling(struct comedi_device *);
void stop_polling(struct comedi_device *); void stop_polling(struct comedi_device *);
int comedi_buf_alloc(struct comedi_device *dev, comedi_subdevice *s, unsigned long int comedi_buf_alloc(struct comedi_device *dev, struct comedi_subdevice *s, unsigned long
new_size); new_size);
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
...@@ -383,11 +382,11 @@ enum subdevice_runflags { ...@@ -383,11 +382,11 @@ enum subdevice_runflags {
*/ */
int do_rangeinfo_ioctl(struct comedi_device *dev, comedi_rangeinfo *arg); int do_rangeinfo_ioctl(struct comedi_device *dev, comedi_rangeinfo *arg);
int check_chanlist(comedi_subdevice *s, int n, unsigned int *chanlist); int check_chanlist(struct comedi_subdevice *s, int n, unsigned int *chanlist);
void comedi_set_subdevice_runflags(comedi_subdevice *s, unsigned mask, void comedi_set_subdevice_runflags(struct comedi_subdevice *s, unsigned mask,
unsigned bits); unsigned bits);
unsigned comedi_get_subdevice_runflags(comedi_subdevice *s); unsigned comedi_get_subdevice_runflags(struct comedi_subdevice *s);
int insn_inval(struct comedi_device *dev, comedi_subdevice *s, int insn_inval(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
/* range stuff */ /* range stuff */
...@@ -428,7 +427,7 @@ static inline int alloc_subdevices(struct comedi_device *dev, ...@@ -428,7 +427,7 @@ static inline int alloc_subdevices(struct comedi_device *dev,
dev->n_subdevices = num_subdevices; dev->n_subdevices = num_subdevices;
dev->subdevices = dev->subdevices =
kcalloc(num_subdevices, sizeof(comedi_subdevice), GFP_KERNEL); kcalloc(num_subdevices, sizeof(struct comedi_subdevice), GFP_KERNEL);
if (!dev->subdevices) if (!dev->subdevices)
return -ENOMEM; return -ENOMEM;
for (i = 0; i < num_subdevices; ++i) { for (i = 0; i < num_subdevices; ++i) {
...@@ -448,7 +447,7 @@ static inline int alloc_private(struct comedi_device *dev, int size) ...@@ -448,7 +447,7 @@ static inline int alloc_private(struct comedi_device *dev, int size)
return 0; return 0;
} }
static inline unsigned int bytes_per_sample(const comedi_subdevice *subd) static inline unsigned int bytes_per_sample(const struct comedi_subdevice *subd)
{ {
if (subd->subdev_flags & SDF_LSAMPL) if (subd->subdev_flags & SDF_LSAMPL)
return sizeof(unsigned int); return sizeof(unsigned int);
...@@ -523,8 +522,8 @@ static inline void *comedi_aux_data(int options[], int n) ...@@ -523,8 +522,8 @@ static inline void *comedi_aux_data(int options[], int n)
int comedi_alloc_board_minor(struct device *hardware_device); int comedi_alloc_board_minor(struct device *hardware_device);
void comedi_free_board_minor(unsigned minor); void comedi_free_board_minor(unsigned minor);
int comedi_alloc_subdevice_minor(struct comedi_device *dev, comedi_subdevice *s); int comedi_alloc_subdevice_minor(struct comedi_device *dev, struct comedi_subdevice *s);
void comedi_free_subdevice_minor(comedi_subdevice *s); void comedi_free_subdevice_minor(struct comedi_subdevice *s);
int comedi_pci_auto_config(struct pci_dev *pcidev, const char *board_name); int comedi_pci_auto_config(struct pci_dev *pcidev, const char *board_name);
void comedi_pci_auto_unconfig(struct pci_dev *pcidev); void comedi_pci_auto_unconfig(struct pci_dev *pcidev);
struct usb_device; /* forward declaration */ struct usb_device; /* forward declaration */
......
drivers/staging/comedi/drivers.c
View file @ 34c43922
...@@ -48,12 +48,12 @@ ...@@ -48,12 +48,12 @@
#include <asm/system.h> #include <asm/system.h>
static int postconfig(struct comedi_device *dev); static int postconfig(struct comedi_device *dev);
static int insn_rw_emulate_bits(struct comedi_device *dev, comedi_subdevice *s, static int insn_rw_emulate_bits(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
static void *comedi_recognize(comedi_driver * driv, const char *name); static void *comedi_recognize(comedi_driver * driv, const char *name);
static void comedi_report_boards(comedi_driver *driv); static void comedi_report_boards(comedi_driver *driv);
static int poll_invalid(struct comedi_device *dev, comedi_subdevice *s); static int poll_invalid(struct comedi_device *dev, struct comedi_subdevice *s);
int comedi_buf_alloc(struct comedi_device *dev, comedi_subdevice *s, int comedi_buf_alloc(struct comedi_device *dev, struct comedi_subdevice *s,
unsigned long new_size); unsigned long new_size);
comedi_driver *comedi_drivers; comedi_driver *comedi_drivers;
...@@ -66,7 +66,7 @@ int comedi_modprobe(int minor) ...@@ -66,7 +66,7 @@ int comedi_modprobe(int minor)
static void cleanup_device(struct comedi_device *dev) static void cleanup_device(struct comedi_device *dev)
{ {
int i; int i;
comedi_subdevice *s; struct comedi_subdevice *s;
if (dev->subdevices) { if (dev->subdevices) {
for (i = 0; i < dev->n_subdevices; i++) { for (i = 0; i < dev->n_subdevices; i++) {
...@@ -227,7 +227,7 @@ int comedi_driver_unregister(comedi_driver *driver) ...@@ -227,7 +227,7 @@ int comedi_driver_unregister(comedi_driver *driver)
static int postconfig(struct comedi_device *dev) static int postconfig(struct comedi_device *dev)
{ {
int i; int i;
comedi_subdevice *s; struct comedi_subdevice *s;
comedi_async *async = NULL; comedi_async *async = NULL;
int ret; int ret;
...@@ -331,18 +331,18 @@ void comedi_report_boards(comedi_driver *driv) ...@@ -331,18 +331,18 @@ void comedi_report_boards(comedi_driver *driv)
printk(" %s\n", driv->driver_name); printk(" %s\n", driv->driver_name);
} }
static int poll_invalid(struct comedi_device *dev, comedi_subdevice *s) static int poll_invalid(struct comedi_device *dev, struct comedi_subdevice *s)
{ {
return -EINVAL; return -EINVAL;
} }
int insn_inval(struct comedi_device *dev, comedi_subdevice *s, int insn_inval(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data) comedi_insn *insn, unsigned int *data)
{ {
return -EINVAL; return -EINVAL;
} }
static int insn_rw_emulate_bits(struct comedi_device *dev, comedi_subdevice *s, static int insn_rw_emulate_bits(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data) comedi_insn *insn, unsigned int *data)
{ {
comedi_insn new_insn; comedi_insn new_insn;
...@@ -412,7 +412,7 @@ static inline unsigned long kvirt_to_kva(unsigned long adr) ...@@ -412,7 +412,7 @@ static inline unsigned long kvirt_to_kva(unsigned long adr)
return kva; return kva;
} }
int comedi_buf_alloc(struct comedi_device *dev, comedi_subdevice *s, int comedi_buf_alloc(struct comedi_device *dev, struct comedi_subdevice *s,
unsigned long new_size) unsigned long new_size)
{ {
comedi_async *async = s->async; comedi_async *async = s->async;
...@@ -538,7 +538,7 @@ int comedi_buf_alloc(struct comedi_device *dev, comedi_subdevice *s, ...@@ -538,7 +538,7 @@ int comedi_buf_alloc(struct comedi_device *dev, comedi_subdevice *s,
* and kernel space */ * and kernel space */
unsigned int comedi_buf_munge(comedi_async *async, unsigned int num_bytes) unsigned int comedi_buf_munge(comedi_async *async, unsigned int num_bytes)
{ {
comedi_subdevice *s = async->subdevice; struct comedi_subdevice *s = async->subdevice;
unsigned int count = 0; unsigned int count = 0;
const unsigned num_sample_bytes = bytes_per_sample(s); const unsigned num_sample_bytes = bytes_per_sample(s);
......
drivers/staging/comedi/drivers/8255.c
View file @ 34c43922
...@@ -116,9 +116,9 @@ static comedi_driver driver_8255 = { ...@@ -116,9 +116,9 @@ static comedi_driver driver_8255 = {
COMEDI_INITCLEANUP(driver_8255); COMEDI_INITCLEANUP(driver_8255);
static void do_config(struct comedi_device *dev, comedi_subdevice * s); static void do_config(struct comedi_device *dev, struct comedi_subdevice * s);
void subdev_8255_interrupt(struct comedi_device *dev, comedi_subdevice * s) void subdev_8255_interrupt(struct comedi_device *dev, struct comedi_subdevice * s)
{ {
short d; short d;
...@@ -143,7 +143,7 @@ static int subdev_8255_cb(int dir, int port, int data, unsigned long arg) ...@@ -143,7 +143,7 @@ static int subdev_8255_cb(int dir, int port, int data, unsigned long arg)
} }
} }
static int subdev_8255_insn(struct comedi_device *dev, comedi_subdevice * s, static int subdev_8255_insn(struct comedi_device *dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
if (data[0]) { if (data[0]) {
...@@ -168,7 +168,7 @@ static int subdev_8255_insn(struct comedi_device *dev, comedi_subdevice * s, ...@@ -168,7 +168,7 @@ static int subdev_8255_insn(struct comedi_device *dev, comedi_subdevice * s,
return 2; return 2;
} }
static int subdev_8255_insn_config(struct comedi_device *dev, comedi_subdevice * s, static int subdev_8255_insn_config(struct comedi_device *dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
unsigned int mask; unsigned int mask;
...@@ -205,7 +205,7 @@ static int subdev_8255_insn_config(struct comedi_device *dev, comedi_subdevice * ...@@ -205,7 +205,7 @@ static int subdev_8255_insn_config(struct comedi_device *dev, comedi_subdevice *
return 1; return 1;
} }
static void do_config(struct comedi_device *dev, comedi_subdevice * s) static void do_config(struct comedi_device *dev, struct comedi_subdevice * s)
{ {
int config; int config;
...@@ -222,7 +222,7 @@ static void do_config(struct comedi_device *dev, comedi_subdevice * s) ...@@ -222,7 +222,7 @@ static void do_config(struct comedi_device *dev, comedi_subdevice * s)
CALLBACK_FUNC(1, _8255_CR, config, CALLBACK_ARG); CALLBACK_FUNC(1, _8255_CR, config, CALLBACK_ARG);
} }
static int subdev_8255_cmdtest(struct comedi_device *dev, comedi_subdevice * s, static int subdev_8255_cmdtest(struct comedi_device *dev, struct comedi_subdevice * s,
comedi_cmd * cmd) comedi_cmd * cmd)
{ {
int err = 0; int err = 0;
...@@ -297,21 +297,21 @@ static int subdev_8255_cmdtest(struct comedi_device *dev, comedi_subdevice * s, ...@@ -297,21 +297,21 @@ static int subdev_8255_cmdtest(struct comedi_device *dev, comedi_subdevice * s,
return 0; return 0;
} }
static int subdev_8255_cmd(struct comedi_device *dev, comedi_subdevice * s) static int subdev_8255_cmd(struct comedi_device *dev, struct comedi_subdevice * s)
{ {
/* FIXME */ /* FIXME */
return 0; return 0;
} }
static int subdev_8255_cancel(struct comedi_device *dev, comedi_subdevice * s) static int subdev_8255_cancel(struct comedi_device *dev, struct comedi_subdevice * s)
{ {
/* FIXME */ /* FIXME */
return 0; return 0;
} }
int subdev_8255_init(struct comedi_device *dev, comedi_subdevice * s, int (*cb) (int, int subdev_8255_init(struct comedi_device *dev, struct comedi_subdevice * s, int (*cb) (int,
int, int, unsigned long), unsigned long arg) int, int, unsigned long), unsigned long arg)
{ {
s->type = COMEDI_SUBD_DIO; s->type = COMEDI_SUBD_DIO;
...@@ -340,7 +340,7 @@ int subdev_8255_init(struct comedi_device *dev, comedi_subdevice * s, int (*cb) ...@@ -340,7 +340,7 @@ int subdev_8255_init(struct comedi_device *dev, comedi_subdevice * s, int (*cb)
return 0; return 0;
} }
int subdev_8255_init_irq(struct comedi_device *dev, comedi_subdevice * s, int subdev_8255_init_irq(struct comedi_device *dev, struct comedi_subdevice * s,
int (*cb) (int, int, int, unsigned long), unsigned long arg) int (*cb) (int, int, int, unsigned long), unsigned long arg)
{ {
int ret; int ret;
...@@ -358,7 +358,7 @@ int subdev_8255_init_irq(struct comedi_device *dev, comedi_subdevice * s, ...@@ -358,7 +358,7 @@ int subdev_8255_init_irq(struct comedi_device *dev, comedi_subdevice * s,
return 0; return 0;
} }
void subdev_8255_cleanup(struct comedi_device *dev, comedi_subdevice * s) void subdev_8255_cleanup(struct comedi_device *dev, struct comedi_subdevice * s)
{ {
if (s->private) { if (s->private) {
if (subdevpriv->have_irq) { if (subdevpriv->have_irq) {
...@@ -420,7 +420,7 @@ static int dev_8255_detach(struct comedi_device *dev) ...@@ -420,7 +420,7 @@ static int dev_8255_detach(struct comedi_device *dev)
{ {
int i; int i;
unsigned long iobase; unsigned long iobase;
comedi_subdevice *s; struct comedi_subdevice *s;
printk("comedi%d: 8255: remove\n", dev->minor); printk("comedi%d: 8255: remove\n", dev->minor);
......
drivers/staging/comedi/drivers/8255.h
View file @ 34c43922
...@@ -28,16 +28,16 @@ ...@@ -28,16 +28,16 @@
#if defined(CONFIG_COMEDI_8255) || defined(CONFIG_COMEDI_8255_MODULE) #if defined(CONFIG_COMEDI_8255) || defined(CONFIG_COMEDI_8255_MODULE)
int subdev_8255_init(struct comedi_device * dev, comedi_subdevice * s, int subdev_8255_init(struct comedi_device * dev, struct comedi_subdevice * s,
int (*cb) (int, int, int, unsigned long), unsigned long arg); int (*cb) (int, int, int, unsigned long), unsigned long arg);
int subdev_8255_init_irq(struct comedi_device * dev, comedi_subdevice * s, int subdev_8255_init_irq(struct comedi_device * dev, struct comedi_subdevice * s,
int (*cb) (int, int, int, unsigned long), unsigned long arg); int (*cb) (int, int, int, unsigned long), unsigned long arg);
void subdev_8255_cleanup(struct comedi_device * dev, comedi_subdevice * s); void subdev_8255_cleanup(struct comedi_device * dev, struct comedi_subdevice * s);
void subdev_8255_interrupt(struct comedi_device * dev, comedi_subdevice * s); void subdev_8255_interrupt(struct comedi_device * dev, struct comedi_subdevice * s);
#else #else
static inline int subdev_8255_init(struct comedi_device * dev, comedi_subdevice * s, static inline int subdev_8255_init(struct comedi_device * dev, struct comedi_subdevice * s,
void *x, unsigned long y) void *x, unsigned long y)
{ {
printk("8255 support not configured -- disabling subdevice\n"); printk("8255 support not configured -- disabling subdevice\n");
...@@ -48,7 +48,7 @@ static inline int subdev_8255_init(struct comedi_device * dev, comedi_subdevice ...@@ -48,7 +48,7 @@ static inline int subdev_8255_init(struct comedi_device * dev, comedi_subdevice
} }
static inline void subdev_8255_cleanup(struct comedi_device * dev, static inline void subdev_8255_cleanup(struct comedi_device * dev,
comedi_subdevice * s) struct comedi_subdevice * s)
{ {
} }
......
drivers/staging/comedi/drivers/acl7225b.c
View file @ 34c43922
...@@ -50,7 +50,7 @@ static comedi_driver driver_acl7225b = { ...@@ -50,7 +50,7 @@ static comedi_driver driver_acl7225b = {
COMEDI_INITCLEANUP(driver_acl7225b); COMEDI_INITCLEANUP(driver_acl7225b);
static int acl7225b_do_insn(struct comedi_device *dev, comedi_subdevice * s, static int acl7225b_do_insn(struct comedi_device *dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
if (insn->n != 2) if (insn->n != 2)
...@@ -71,7 +71,7 @@ static int acl7225b_do_insn(struct comedi_device *dev, comedi_subdevice * s, ...@@ -71,7 +71,7 @@ static int acl7225b_do_insn(struct comedi_device *dev, comedi_subdevice * s,
return 2; return 2;
} }
static int acl7225b_di_insn(struct comedi_device *dev, comedi_subdevice * s, static int acl7225b_di_insn(struct comedi_device *dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
if (insn->n != 2) if (insn->n != 2)
...@@ -85,7 +85,7 @@ static int acl7225b_di_insn(struct comedi_device *dev, comedi_subdevice * s, ...@@ -85,7 +85,7 @@ static int acl7225b_di_insn(struct comedi_device *dev, comedi_subdevice * s,
static int acl7225b_attach(struct comedi_device *dev, comedi_devconfig * it) static int acl7225b_attach(struct comedi_device *dev, comedi_devconfig * it)
{ {
comedi_subdevice *s; struct comedi_subdevice *s;
int iobase, iorange; int iobase, iorange;
iobase = it->options[0]; iobase = it->options[0];
......
drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.c
View file @ 34c43922
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
| BYTE_ b_InputClockLevel, | | BYTE_ b_InputClockLevel, |
| BYTE_ b_OutputLevel, | | BYTE_ b_OutputLevel, |
| BYTE_ b_HardwareGateLevel) | BYTE_ b_HardwareGateLevel)
INT i_InsnConfig_InitTimer(struct comedi_device *dev,comedi_subdevice *s, INT i_InsnConfig_InitTimer(struct comedi_device *dev,struct comedi_subdevice *s,
comedi_insn *insn,unsigned int *data) comedi_insn *insn,unsigned int *data)
| |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
...@@ -219,7 +219,7 @@ INT i_InsnConfig_InitTimer(struct comedi_device *dev,comedi_subdevice *s, ...@@ -219,7 +219,7 @@ INT i_InsnConfig_InitTimer(struct comedi_device *dev,comedi_subdevice *s,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_InsnConfigInitTimer(struct comedi_device * dev, comedi_subdevice * s, INT i_APCI1710_InsnConfigInitTimer(struct comedi_device * dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
...@@ -406,7 +406,7 @@ INT i_APCI1710_InsnConfigInitTimer(struct comedi_device * dev, comedi_subdevice ...@@ -406,7 +406,7 @@ INT i_APCI1710_InsnConfigInitTimer(struct comedi_device * dev, comedi_subdevice
| BYTE_ b_ModulNbr, | | BYTE_ b_ModulNbr, |
| BYTE_ b_TimerNbr, | | BYTE_ b_TimerNbr, |
| BYTE_ b_InterruptEnable) | BYTE_ b_InterruptEnable)
INT i_APCI1710_InsnWriteEnableDisableTimer(struct comedi_device *dev,comedi_subdevice *s, INT i_APCI1710_InsnWriteEnableDisableTimer(struct comedi_device *dev,struct comedi_subdevice *s,
comedi_insn *insn,unsigned int *data) | comedi_insn *insn,unsigned int *data) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Enable OR Disable the Timer (b_TimerNbr) from selected module | | Task : Enable OR Disable the Timer (b_TimerNbr) from selected module |
...@@ -449,7 +449,7 @@ i_ReturnValue=insn->n; ...@@ -449,7 +449,7 @@ i_ReturnValue=insn->n;
*/ */
INT i_APCI1710_InsnWriteEnableDisableTimer(struct comedi_device * dev, INT i_APCI1710_InsnWriteEnableDisableTimer(struct comedi_device * dev,
comedi_subdevice * s, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
...@@ -561,7 +561,7 @@ INT i_APCI1710_InsnWriteEnableDisableTimer(struct comedi_device * dev, ...@@ -561,7 +561,7 @@ INT i_APCI1710_InsnWriteEnableDisableTimer(struct comedi_device * dev,
| (BYTE_ b_BoardHandle, | | (BYTE_ b_BoardHandle, |
| BYTE_ b_ModulNbr, | | BYTE_ b_ModulNbr, |
| PULONG_ pul_TimerValueArray) | PULONG_ pul_TimerValueArray)
INT i_APCI1710_InsnReadAllTimerValue(struct comedi_device *dev,comedi_subdevice *s, INT i_APCI1710_InsnReadAllTimerValue(struct comedi_device *dev,struct comedi_subdevice *s,
comedi_insn *insn,unsigned int *data) | comedi_insn *insn,unsigned int *data) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Return the all timer values from selected timer | | Task : Return the all timer values from selected timer |
...@@ -590,7 +590,7 @@ INT i_APCI1710_InsnReadAllTimerValue(struct comedi_device *dev,comedi_subdevice ...@@ -590,7 +590,7 @@ INT i_APCI1710_InsnReadAllTimerValue(struct comedi_device *dev,comedi_subdevice
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_InsnReadAllTimerValue(struct comedi_device *dev, comedi_subdevice *s, INT i_APCI1710_InsnReadAllTimerValue(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data) comedi_insn *insn, unsigned int *data)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
...@@ -669,7 +669,7 @@ INT i_APCI1710_InsnReadAllTimerValue(struct comedi_device *dev, comedi_subdevice ...@@ -669,7 +669,7 @@ INT i_APCI1710_InsnReadAllTimerValue(struct comedi_device *dev, comedi_subdevice
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name :INT i_APCI1710_InsnBitsTimer(struct comedi_device *dev, | Function Name :INT i_APCI1710_InsnBitsTimer(struct comedi_device *dev,
comedi_subdevice *s,comedi_insn *insn,unsigned int *data) | struct comedi_subdevice *s,comedi_insn *insn,unsigned int *data) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Read write functions for Timer | | Task : Read write functions for Timer |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
...@@ -681,7 +681,7 @@ comedi_subdevice *s,comedi_insn *insn,unsigned int *data) | ...@@ -681,7 +681,7 @@ comedi_subdevice *s,comedi_insn *insn,unsigned int *data) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_InsnBitsTimer(struct comedi_device * dev, comedi_subdevice * s, INT i_APCI1710_InsnBitsTimer(struct comedi_device * dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
BYTE b_BitsType; BYTE b_BitsType;
......
drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.h
View file @ 34c43922
...@@ -34,20 +34,20 @@ ...@@ -34,20 +34,20 @@
/* /*
* 82X54 TIMER INISIALISATION FUNCTION * 82X54 TIMER INISIALISATION FUNCTION
*/ */
INT i_APCI1710_InsnConfigInitTimer(struct comedi_device *dev, comedi_subdevice *s, INT i_APCI1710_InsnConfigInitTimer(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
INT i_APCI1710_InsnWriteEnableDisableTimer(struct comedi_device *dev, INT i_APCI1710_InsnWriteEnableDisableTimer(struct comedi_device *dev,
comedi_subdevice *s, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
/* /*
* 82X54 READ FUNCTION * 82X54 READ FUNCTION
*/ */
INT i_APCI1710_InsnReadAllTimerValue(struct comedi_device *dev, comedi_subdevice *s, INT i_APCI1710_InsnReadAllTimerValue(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
INT i_APCI1710_InsnBitsTimer(struct comedi_device *dev, comedi_subdevice *s, INT i_APCI1710_InsnBitsTimer(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
/* /*
......
drivers/staging/comedi/drivers/addi-data/APCI1710_Chrono.c
View file @ 34c43922
...@@ -131,7 +131,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc ...@@ -131,7 +131,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_InsnConfigInitChrono(struct comedi_device * dev, comedi_subdevice * s, INT i_APCI1710_InsnConfigInitChrono(struct comedi_device * dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
...@@ -791,7 +791,7 @@ INT i_APCI1710_InsnConfigInitChrono(struct comedi_device * dev, comedi_subdevice ...@@ -791,7 +791,7 @@ INT i_APCI1710_InsnConfigInitChrono(struct comedi_device * dev, comedi_subdevice
| BYTE_ b_CycleMode, | | BYTE_ b_CycleMode, |
| BYTE_ b_InterruptEnable) | BYTE_ b_InterruptEnable)
INT i_APCI1710_InsnWriteEnableDisableChrono(struct comedi_device *dev, INT i_APCI1710_InsnWriteEnableDisableChrono(struct comedi_device *dev,
comedi_subdevice *s,comedi_insn *insn,unsigned int *data) | struct comedi_subdevice *s,comedi_insn *insn,unsigned int *data) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Enable the chronometer from selected module | | Task : Enable the chronometer from selected module |
| (b_ModulNbr). You must calling the | | (b_ModulNbr). You must calling the |
...@@ -841,7 +841,7 @@ comedi_subdevice *s,comedi_insn *insn,unsigned int *data) | ...@@ -841,7 +841,7 @@ comedi_subdevice *s,comedi_insn *insn,unsigned int *data) |
*/ */
INT i_APCI1710_InsnWriteEnableDisableChrono(struct comedi_device * dev, INT i_APCI1710_InsnWriteEnableDisableChrono(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
BYTE b_ModulNbr, b_CycleMode, b_InterruptEnable, b_Action; BYTE b_ModulNbr, b_CycleMode, b_InterruptEnable, b_Action;
...@@ -1077,7 +1077,7 @@ INT i_APCI1710_InsnWriteEnableDisableChrono(struct comedi_device * dev, ...@@ -1077,7 +1077,7 @@ INT i_APCI1710_InsnWriteEnableDisableChrono(struct comedi_device * dev,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name :INT i_APCI1710_InsnReadChrono(struct comedi_device *dev,comedi_subdevice *s, | Function Name :INT i_APCI1710_InsnReadChrono(struct comedi_device *dev,struct comedi_subdevice *s,
comedi_insn *insn,unsigned int *data) | comedi_insn *insn,unsigned int *data) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Read functions for Timer | | Task : Read functions for Timer |
...@@ -1090,7 +1090,7 @@ comedi_insn *insn,unsigned int *data) | ...@@ -1090,7 +1090,7 @@ comedi_insn *insn,unsigned int *data) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_InsnReadChrono(struct comedi_device * dev, comedi_subdevice * s, INT i_APCI1710_InsnReadChrono(struct comedi_device * dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
BYTE b_ReadType; BYTE b_ReadType;
...@@ -1757,7 +1757,7 @@ INT i_APCI1710_ConvertChronoValue(struct comedi_device * dev, ...@@ -1757,7 +1757,7 @@ INT i_APCI1710_ConvertChronoValue(struct comedi_device * dev,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : INT i_APCI1710_InsnBitsChronoDigitalIO(struct comedi_device *dev,comedi_subdevice *s, | Function Name : INT i_APCI1710_InsnBitsChronoDigitalIO(struct comedi_device *dev,struct comedi_subdevice *s,
comedi_insn *insn,unsigned int *data) | comedi_insn *insn,unsigned int *data) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Sets the output witch has been passed with the | | Task : Sets the output witch has been passed with the |
...@@ -1877,7 +1877,7 @@ INT i_APCI1710_ConvertChronoValue(struct comedi_device * dev, ...@@ -1877,7 +1877,7 @@ INT i_APCI1710_ConvertChronoValue(struct comedi_device * dev,
*/ */
INT i_APCI1710_InsnBitsChronoDigitalIO(struct comedi_device * dev, INT i_APCI1710_InsnBitsChronoDigitalIO(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
BYTE b_ModulNbr, b_OutputChannel, b_InputChannel, b_IOType; BYTE b_ModulNbr, b_OutputChannel, b_InputChannel, b_IOType;
......
drivers/staging/comedi/drivers/addi-data/APCI1710_Chrono.h
View file @ 34c43922
...@@ -35,18 +35,18 @@ ...@@ -35,18 +35,18 @@
/* /*
* CHRONOMETER INISIALISATION FUNCTION * CHRONOMETER INISIALISATION FUNCTION
*/ */
INT i_APCI1710_InsnConfigInitChrono(struct comedi_device *dev, comedi_subdevice *s, INT i_APCI1710_InsnConfigInitChrono(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
INT i_APCI1710_InsnWriteEnableDisableChrono(struct comedi_device *dev, INT i_APCI1710_InsnWriteEnableDisableChrono(struct comedi_device *dev,
comedi_subdevice *s, struct comedi_subdevice *s,
comedi_insn *insn, comedi_insn *insn,
unsigned int *data); unsigned int *data);
/* /*
* CHRONOMETER READ FUNCTION * CHRONOMETER READ FUNCTION
*/ */
INT i_APCI1710_InsnReadChrono(struct comedi_device *dev, comedi_subdevice *s, INT i_APCI1710_InsnReadChrono(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
INT i_APCI1710_GetChronoProgressStatus(struct comedi_device *dev, INT i_APCI1710_GetChronoProgressStatus(struct comedi_device *dev,
...@@ -70,5 +70,5 @@ INT i_APCI1710_ConvertChronoValue(struct comedi_device *dev, ...@@ -70,5 +70,5 @@ INT i_APCI1710_ConvertChronoValue(struct comedi_device *dev,
* CHRONOMETER DIGITAL INPUT OUTPUT FUNCTION * CHRONOMETER DIGITAL INPUT OUTPUT FUNCTION
*/ */
INT i_APCI1710_InsnBitsChronoDigitalIO(struct comedi_device *dev, INT i_APCI1710_InsnBitsChronoDigitalIO(struct comedi_device *dev,
comedi_subdevice *s, comedi_insn *insn, struct comedi_subdevice *s, comedi_insn *insn,
unsigned int *data); unsigned int *data);
drivers/staging/comedi/drivers/addi-data/APCI1710_Dig_io.c
View file @ 34c43922
...@@ -62,7 +62,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc ...@@ -62,7 +62,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : INT i_APCI1710_InsnConfigDigitalIO(struct comedi_device *dev, | | Function Name : INT i_APCI1710_InsnConfigDigitalIO(struct comedi_device *dev, |
| comedi_subdevice *s,comedi_insn *insn,unsigned int *data)| | struct comedi_subdevice *s,comedi_insn *insn,unsigned int *data)|
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Configure the digital I/O operating mode from selected | | Task : Configure the digital I/O operating mode from selected |
| module (b_ModulNbr). You must calling this function be| | module (b_ModulNbr). You must calling this function be|
...@@ -99,7 +99,7 @@ Activates and deactivates the digital output memory. ...@@ -99,7 +99,7 @@ Activates and deactivates the digital output memory.
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_InsnConfigDigitalIO(struct comedi_device * dev, comedi_subdevice * s, INT i_APCI1710_InsnConfigDigitalIO(struct comedi_device * dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
BYTE b_ModulNbr, b_ChannelAMode, b_ChannelBMode; BYTE b_ModulNbr, b_ChannelAMode, b_ChannelBMode;
...@@ -294,7 +294,7 @@ INT i_APCI1710_InsnConfigDigitalIO(struct comedi_device * dev, comedi_subdevice ...@@ -294,7 +294,7 @@ INT i_APCI1710_InsnConfigDigitalIO(struct comedi_device * dev, comedi_subdevice
// //
// PBYTE_ pb_ChannelStatus) // PBYTE_ pb_ChannelStatus)
INT i_APCI1710_InsnReadDigitalIOChlValue(struct comedi_device * dev, INT i_APCI1710_InsnReadDigitalIOChlValue(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
DWORD dw_StatusReg; DWORD dw_StatusReg;
...@@ -446,7 +446,7 @@ INT i_APCI1710_InsnReadDigitalIOChlValue(struct comedi_device * dev, ...@@ -446,7 +446,7 @@ INT i_APCI1710_InsnReadDigitalIOChlValue(struct comedi_device * dev,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : INT i_APCI1710_InsnWriteDigitalIOChlOnOff(comedi_device | Function Name : INT i_APCI1710_InsnWriteDigitalIOChlOnOff(comedi_device
|*dev,comedi_subdevice *s,comedi_insn *insn,unsigned int *data) |*dev,struct comedi_subdevice *s,comedi_insn *insn,unsigned int *data)
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Sets or resets the output witch has been passed with the | | Task : Sets or resets the output witch has been passed with the |
...@@ -482,7 +482,7 @@ INT i_APCI1710_InsnReadDigitalIOChlValue(struct comedi_device * dev, ...@@ -482,7 +482,7 @@ INT i_APCI1710_InsnReadDigitalIOChlValue(struct comedi_device * dev,
// BYTE_ b_ModulNbr, // BYTE_ b_ModulNbr,
// BYTE_ b_OutputChannel) // BYTE_ b_OutputChannel)
INT i_APCI1710_InsnWriteDigitalIOChlOnOff(struct comedi_device * dev, INT i_APCI1710_InsnWriteDigitalIOChlOnOff(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
DWORD dw_WriteValue = 0; DWORD dw_WriteValue = 0;
...@@ -729,7 +729,7 @@ INT i_APCI1710_InsnWriteDigitalIOChlOnOff(struct comedi_device * dev, ...@@ -729,7 +729,7 @@ INT i_APCI1710_InsnWriteDigitalIOChlOnOff(struct comedi_device * dev,
// BYTE_ b_ModulNbr, // BYTE_ b_ModulNbr,
// BYTE_ b_PortValue) // BYTE_ b_PortValue)
INT i_APCI1710_InsnBitsDigitalIOPortOnOff(struct comedi_device * dev, INT i_APCI1710_InsnBitsDigitalIOPortOnOff(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
DWORD dw_WriteValue = 0; DWORD dw_WriteValue = 0;
......
drivers/staging/comedi/drivers/addi-data/APCI1710_Dig_io.h
View file @ 34c43922
...@@ -27,20 +27,20 @@ ...@@ -27,20 +27,20 @@
/* /*
* DIGITAL I/O INISIALISATION FUNCTION * DIGITAL I/O INISIALISATION FUNCTION
*/ */
INT i_APCI1710_InsnConfigDigitalIO(struct comedi_device *dev, comedi_subdevice *s, INT i_APCI1710_InsnConfigDigitalIO(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
/* /*
* INPUT OUTPUT FUNCTIONS * INPUT OUTPUT FUNCTIONS
*/ */
INT i_APCI1710_InsnReadDigitalIOChlValue(struct comedi_device *dev, INT i_APCI1710_InsnReadDigitalIOChlValue(struct comedi_device *dev,
comedi_subdevice *s, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
INT i_APCI1710_InsnWriteDigitalIOChlOnOff(struct comedi_device *dev, INT i_APCI1710_InsnWriteDigitalIOChlOnOff(struct comedi_device *dev,
comedi_subdevice *s, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
INT i_APCI1710_InsnBitsDigitalIOPortOnOff(struct comedi_device *dev, INT i_APCI1710_InsnBitsDigitalIOPortOnOff(struct comedi_device *dev,
comedi_subdevice *s, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
drivers/staging/comedi/drivers/addi-data/APCI1710_INCCPT.c
View file @ 34c43922
...@@ -61,7 +61,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc ...@@ -61,7 +61,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| INT i_APCI1710_InsnConfigINCCPT(struct comedi_device *dev,comedi_subdevice *s, | INT i_APCI1710_InsnConfigINCCPT(struct comedi_device *dev,struct comedi_subdevice *s,
comedi_insn *insn,unsigned int *data) comedi_insn *insn,unsigned int *data)
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
...@@ -75,7 +75,7 @@ comedi_insn *insn,unsigned int *data) ...@@ -75,7 +75,7 @@ comedi_insn *insn,unsigned int *data)
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_InsnConfigINCCPT(struct comedi_device * dev, comedi_subdevice * s, INT i_APCI1710_InsnConfigINCCPT(struct comedi_device * dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
UINT ui_ConfigType; UINT ui_ConfigType;
...@@ -2002,7 +2002,7 @@ INT i_APCI1710_InitFrequencyMeasurement(struct comedi_device * dev, ...@@ -2002,7 +2002,7 @@ INT i_APCI1710_InitFrequencyMeasurement(struct comedi_device * dev,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name :INT i_APCI1710_InsnBitsINCCPT(struct comedi_device *dev,comedi_subdevice *s, | Function Name :INT i_APCI1710_InsnBitsINCCPT(struct comedi_device *dev,struct comedi_subdevice *s,
comedi_insn *insn,unsigned int *data) | comedi_insn *insn,unsigned int *data) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Set & Clear Functions for INC_CPT | | Task : Set & Clear Functions for INC_CPT |
...@@ -2015,7 +2015,7 @@ comedi_insn *insn,unsigned int *data) | ...@@ -2015,7 +2015,7 @@ comedi_insn *insn,unsigned int *data) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_InsnBitsINCCPT(struct comedi_device * dev, comedi_subdevice * s, INT i_APCI1710_InsnBitsINCCPT(struct comedi_device * dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
UINT ui_BitsType; UINT ui_BitsType;
...@@ -2939,7 +2939,7 @@ INT i_APCI1710_SetDigitalChlOff(struct comedi_device * dev, BYTE b_ModulNbr) ...@@ -2939,7 +2939,7 @@ INT i_APCI1710_SetDigitalChlOff(struct comedi_device * dev, BYTE b_ModulNbr)
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name :INT i_APCI1710_InsnWriteINCCPT(struct comedi_device *dev,comedi_subdevice *s, | Function Name :INT i_APCI1710_InsnWriteINCCPT(struct comedi_device *dev,struct comedi_subdevice *s,
comedi_insn *insn,unsigned int *data) | comedi_insn *insn,unsigned int *data) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Enable Disable functions for INC_CPT | | Task : Enable Disable functions for INC_CPT |
...@@ -2951,7 +2951,7 @@ comedi_insn *insn,unsigned int *data) | ...@@ -2951,7 +2951,7 @@ comedi_insn *insn,unsigned int *data) |
| Return Value : | Return Value :
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_InsnWriteINCCPT(struct comedi_device * dev, comedi_subdevice * s, INT i_APCI1710_InsnWriteINCCPT(struct comedi_device * dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
UINT ui_WriteType; UINT ui_WriteType;
...@@ -4037,7 +4037,7 @@ INT i_APCI1710_DisableFrequencyMeasurement(struct comedi_device * dev, BYTE b_Mo ...@@ -4037,7 +4037,7 @@ INT i_APCI1710_DisableFrequencyMeasurement(struct comedi_device * dev, BYTE b_Mo
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name :INT i_APCI1710_InsnWriteINCCPT(struct comedi_device *dev,comedi_subdevice *s, | Function Name :INT i_APCI1710_InsnWriteINCCPT(struct comedi_device *dev,struct comedi_subdevice *s,
comedi_insn *insn,unsigned int *data) | comedi_insn *insn,unsigned int *data) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Read and Get functions for INC_CPT | | Task : Read and Get functions for INC_CPT |
...@@ -4049,7 +4049,7 @@ comedi_insn *insn,unsigned int *data) | ...@@ -4049,7 +4049,7 @@ comedi_insn *insn,unsigned int *data) |
| Return Value : | Return Value :
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_InsnReadINCCPT(struct comedi_device * dev, comedi_subdevice * s, INT i_APCI1710_InsnReadINCCPT(struct comedi_device * dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
UINT ui_ReadType; UINT ui_ReadType;
......
drivers/staging/comedi/drivers/addi-data/APCI1710_INCCPT.h
View file @ 34c43922
...@@ -132,16 +132,16 @@ ...@@ -132,16 +132,16 @@
#define APCI1710_INCCPT_DISABLEFREQUENCYMEASUREMENT 409 #define APCI1710_INCCPT_DISABLEFREQUENCYMEASUREMENT 409
/************ Main Functions *************/ /************ Main Functions *************/
INT i_APCI1710_InsnConfigINCCPT(struct comedi_device *dev, comedi_subdevice *s, INT i_APCI1710_InsnConfigINCCPT(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int * data); comedi_insn *insn, unsigned int * data);
INT i_APCI1710_InsnBitsINCCPT(struct comedi_device *dev, comedi_subdevice * s, INT i_APCI1710_InsnBitsINCCPT(struct comedi_device *dev, struct comedi_subdevice * s,
comedi_insn *insn, unsigned int * data); comedi_insn *insn, unsigned int * data);
INT i_APCI1710_InsnWriteINCCPT(struct comedi_device *dev, comedi_subdevice * s, INT i_APCI1710_InsnWriteINCCPT(struct comedi_device *dev, struct comedi_subdevice * s,
comedi_insn *insn, unsigned int * data); comedi_insn *insn, unsigned int * data);
INT i_APCI1710_InsnReadINCCPT(struct comedi_device *dev, comedi_subdevice * s, INT i_APCI1710_InsnReadINCCPT(struct comedi_device *dev, struct comedi_subdevice * s,
comedi_insn *insn, unsigned int * data); comedi_insn *insn, unsigned int * data);
/*********** Supplementary Functions********/ /*********** Supplementary Functions********/
......
drivers/staging/comedi/drivers/addi-data/APCI1710_Inp_cpt.c
View file @ 34c43922
...@@ -124,7 +124,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc ...@@ -124,7 +124,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
*/ */
INT i_APCI1710_InsnConfigInitPulseEncoder(struct comedi_device * dev, INT i_APCI1710_InsnConfigInitPulseEncoder(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
DWORD dw_IntRegister; DWORD dw_IntRegister;
...@@ -415,7 +415,7 @@ INT i_APCI1710_InsnConfigInitPulseEncoder(struct comedi_device * dev, ...@@ -415,7 +415,7 @@ INT i_APCI1710_InsnConfigInitPulseEncoder(struct comedi_device * dev,
*/ */
INT i_APCI1710_InsnWriteEnableDisablePulseEncoder(struct comedi_device * dev, INT i_APCI1710_InsnWriteEnableDisablePulseEncoder(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
BYTE b_ModulNbr; BYTE b_ModulNbr;
...@@ -709,7 +709,7 @@ INT i_APCI1710_InsnWriteEnableDisablePulseEncoder(struct comedi_device * dev, ...@@ -709,7 +709,7 @@ INT i_APCI1710_InsnWriteEnableDisablePulseEncoder(struct comedi_device * dev,
PBYTE_ pb_Status) PBYTE_ pb_Status)
*/ */
INT i_APCI1710_InsnBitsReadWritePulseEncoder(struct comedi_device * dev, INT i_APCI1710_InsnBitsReadWritePulseEncoder(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
DWORD dw_StatusRegister; DWORD dw_StatusRegister;
...@@ -835,7 +835,7 @@ INT i_APCI1710_InsnBitsReadWritePulseEncoder(struct comedi_device * dev, ...@@ -835,7 +835,7 @@ INT i_APCI1710_InsnBitsReadWritePulseEncoder(struct comedi_device * dev,
} }
INT i_APCI1710_InsnReadInterruptPulseEncoder(struct comedi_device * dev, INT i_APCI1710_InsnReadInterruptPulseEncoder(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
data[0] = devpriv->s_InterruptParameters. data[0] = devpriv->s_InterruptParameters.
......
drivers/staging/comedi/drivers/addi-data/APCI1710_Inp_cpt.h
View file @ 34c43922
...@@ -22,11 +22,11 @@ ...@@ -22,11 +22,11 @@
#define APCI1710_PULSEENCODER_WRITE 1 #define APCI1710_PULSEENCODER_WRITE 1
INT i_APCI1710_InsnConfigInitPulseEncoder(struct comedi_device *dev, INT i_APCI1710_InsnConfigInitPulseEncoder(struct comedi_device *dev,
comedi_subdevice *s, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
INT i_APCI1710_InsnWriteEnableDisablePulseEncoder(struct comedi_device *dev, INT i_APCI1710_InsnWriteEnableDisablePulseEncoder(struct comedi_device *dev,
comedi_subdevice *s, struct comedi_subdevice *s,
comedi_insn *insn, comedi_insn *insn,
unsigned int *data); unsigned int *data);
...@@ -34,7 +34,7 @@ INT i_APCI1710_InsnWriteEnableDisablePulseEncoder(struct comedi_device *dev, ...@@ -34,7 +34,7 @@ INT i_APCI1710_InsnWriteEnableDisablePulseEncoder(struct comedi_device *dev,
* READ PULSE ENCODER FUNCTIONS * READ PULSE ENCODER FUNCTIONS
*/ */
INT i_APCI1710_InsnReadInterruptPulseEncoder(struct comedi_device *dev, INT i_APCI1710_InsnReadInterruptPulseEncoder(struct comedi_device *dev,
comedi_subdevice *s, struct comedi_subdevice *s,
comedi_insn *insn, comedi_insn *insn,
unsigned int *data); unsigned int *data);
...@@ -42,6 +42,6 @@ INT i_APCI1710_InsnReadInterruptPulseEncoder(struct comedi_device *dev, ...@@ -42,6 +42,6 @@ INT i_APCI1710_InsnReadInterruptPulseEncoder(struct comedi_device *dev,
* WRITE PULSE ENCODER FUNCTIONS * WRITE PULSE ENCODER FUNCTIONS
*/ */
INT i_APCI1710_InsnBitsReadWritePulseEncoder(struct comedi_device *dev, INT i_APCI1710_InsnBitsReadWritePulseEncoder(struct comedi_device *dev,
comedi_subdevice *s, struct comedi_subdevice *s,
comedi_insn *insn, comedi_insn *insn,
unsigned int *data); unsigned int *data);
drivers/staging/comedi/drivers/addi-data/APCI1710_Pwm.c
View file @ 34c43922
...@@ -58,7 +58,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc ...@@ -58,7 +58,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name :INT i_APCI1710_InsnConfigPWM(struct comedi_device *dev, | Function Name :INT i_APCI1710_InsnConfigPWM(struct comedi_device *dev,
comedi_subdevice *s,comedi_insn *insn,unsigned int *data) | struct comedi_subdevice *s,comedi_insn *insn,unsigned int *data) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Pwm Init and Get Pwm Initialisation | | Task : Pwm Init and Get Pwm Initialisation |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
...@@ -70,7 +70,7 @@ comedi_subdevice *s,comedi_insn *insn,unsigned int *data) ...@@ -70,7 +70,7 @@ comedi_subdevice *s,comedi_insn *insn,unsigned int *data)
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_InsnConfigPWM(struct comedi_device * dev, comedi_subdevice * s, INT i_APCI1710_InsnConfigPWM(struct comedi_device * dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
BYTE b_ConfigType; BYTE b_ConfigType;
...@@ -1671,7 +1671,7 @@ INT i_APCI1710_GetPWMInitialisation(struct comedi_device * dev, ...@@ -1671,7 +1671,7 @@ INT i_APCI1710_GetPWMInitialisation(struct comedi_device * dev,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name :INT i_APCI1710_InsnWritePWM(struct comedi_device *dev, | Function Name :INT i_APCI1710_InsnWritePWM(struct comedi_device *dev,
comedi_subdevice *s,comedi_insn *insn,unsigned int *data) | struct comedi_subdevice *s,comedi_insn *insn,unsigned int *data) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Pwm Enable Disable and Set New Timing | | Task : Pwm Enable Disable and Set New Timing |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
...@@ -1683,7 +1683,7 @@ comedi_subdevice *s,comedi_insn *insn,unsigned int *data) ...@@ -1683,7 +1683,7 @@ comedi_subdevice *s,comedi_insn *insn,unsigned int *data)
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_InsnWritePWM(struct comedi_device * dev, comedi_subdevice * s, INT i_APCI1710_InsnWritePWM(struct comedi_device * dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
BYTE b_WriteType; BYTE b_WriteType;
...@@ -3460,7 +3460,7 @@ INT i_APCI1710_SetNewPWMTiming(struct comedi_device * dev, ...@@ -3460,7 +3460,7 @@ INT i_APCI1710_SetNewPWMTiming(struct comedi_device * dev,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_InsnReadGetPWMStatus(struct comedi_device * dev, comedi_subdevice * s, INT i_APCI1710_InsnReadGetPWMStatus(struct comedi_device * dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
...@@ -3562,7 +3562,7 @@ INT i_APCI1710_InsnReadGetPWMStatus(struct comedi_device * dev, comedi_subdevice ...@@ -3562,7 +3562,7 @@ INT i_APCI1710_InsnReadGetPWMStatus(struct comedi_device * dev, comedi_subdevice
} }
INT i_APCI1710_InsnBitsReadPWMInterrupt(struct comedi_device * dev, INT i_APCI1710_InsnBitsReadPWMInterrupt(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
data[0] = devpriv->s_InterruptParameters. data[0] = devpriv->s_InterruptParameters.
s_FIFOInterruptParameters[devpriv-> s_FIFOInterruptParameters[devpriv->
......
drivers/staging/comedi/drivers/addi-data/APCI1710_Pwm.h
View file @ 34c43922
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#define APCI1710_PWM_ENABLE 1 #define APCI1710_PWM_ENABLE 1
#define APCI1710_PWM_NEWTIMING 2 #define APCI1710_PWM_NEWTIMING 2
INT i_APCI1710_InsnConfigPWM(struct comedi_device *dev, comedi_subdevice *s, INT i_APCI1710_InsnConfigPWM(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
INT i_APCI1710_InitPWM(struct comedi_device *dev, INT i_APCI1710_InitPWM(struct comedi_device *dev,
...@@ -50,7 +50,7 @@ INT i_APCI1710_GetPWMInitialisation(struct comedi_device *dev, ...@@ -50,7 +50,7 @@ INT i_APCI1710_GetPWMInitialisation(struct comedi_device *dev,
PBYTE pb_ExternGate, PBYTE pb_ExternGate,
PBYTE pb_InterruptEnable, PBYTE pb_Enable); PBYTE pb_InterruptEnable, PBYTE pb_Enable);
INT i_APCI1710_InsnWritePWM(struct comedi_device *dev, comedi_subdevice *s, INT i_APCI1710_InsnWritePWM(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
INT i_APCI1710_EnablePWM(struct comedi_device *dev, INT i_APCI1710_EnablePWM(struct comedi_device *dev,
...@@ -68,9 +68,9 @@ INT i_APCI1710_SetNewPWMTiming(struct comedi_device *dev, ...@@ -68,9 +68,9 @@ INT i_APCI1710_SetNewPWMTiming(struct comedi_device *dev,
INT i_APCI1710_DisablePWM(struct comedi_device *dev, BYTE b_ModulNbr, BYTE b_PWM); INT i_APCI1710_DisablePWM(struct comedi_device *dev, BYTE b_ModulNbr, BYTE b_PWM);
INT i_APCI1710_InsnReadGetPWMStatus(struct comedi_device *dev, comedi_subdevice *s, INT i_APCI1710_InsnReadGetPWMStatus(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
INT i_APCI1710_InsnBitsReadPWMInterrupt(struct comedi_device *dev, INT i_APCI1710_InsnBitsReadPWMInterrupt(struct comedi_device *dev,
comedi_subdevice *s, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.c
View file @ 34c43922
...@@ -133,7 +133,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc ...@@ -133,7 +133,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_InsnConfigInitSSI(struct comedi_device * dev, comedi_subdevice * s, INT i_APCI1710_InsnConfigInitSSI(struct comedi_device * dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
...@@ -362,7 +362,7 @@ INT i_APCI1710_InsnConfigInitSSI(struct comedi_device * dev, comedi_subdevice * ...@@ -362,7 +362,7 @@ INT i_APCI1710_InsnConfigInitSSI(struct comedi_device * dev, comedi_subdevice *
| BYTE_ b_SelectedSSI, | | BYTE_ b_SelectedSSI, |
| PULONG_ pul_Position, | | PULONG_ pul_Position, |
| PULONG_ pul_TurnCpt) | PULONG_ pul_TurnCpt)
INT i_APCI1710_ReadSSIValue(struct comedi_device *dev,comedi_subdevice *s, INT i_APCI1710_ReadSSIValue(struct comedi_device *dev,struct comedi_subdevice *s,
comedi_insn *insn,unsigned int *data) | comedi_insn *insn,unsigned int *data) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : | Task :
...@@ -400,7 +400,7 @@ pul_Position = (PULONG) &data[0]; ...@@ -400,7 +400,7 @@ pul_Position = (PULONG) &data[0];
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_InsnReadSSIValue(struct comedi_device * dev, comedi_subdevice * s, INT i_APCI1710_InsnReadSSIValue(struct comedi_device * dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
...@@ -735,7 +735,7 @@ INT i_APCI1710_InsnReadSSIValue(struct comedi_device * dev, comedi_subdevice * s ...@@ -735,7 +735,7 @@ INT i_APCI1710_InsnReadSSIValue(struct comedi_device * dev, comedi_subdevice * s
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_InsnBitsSSIDigitalIO(struct comedi_device * dev, comedi_subdevice * s, INT i_APCI1710_InsnBitsSSIDigitalIO(struct comedi_device * dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
......
drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.h
View file @ 34c43922
...@@ -33,11 +33,11 @@ ...@@ -33,11 +33,11 @@
/* /*
* SSI INISIALISATION FUNCTION * SSI INISIALISATION FUNCTION
*/ */
INT i_APCI1710_InsnConfigInitSSI(struct comedi_device *dev, comedi_subdevice *s, INT i_APCI1710_InsnConfigInitSSI(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
INT i_APCI1710_InsnReadSSIValue(struct comedi_device *dev, comedi_subdevice *s, INT i_APCI1710_InsnReadSSIValue(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
INT i_APCI1710_InsnBitsSSIDigitalIO(struct comedi_device *dev, comedi_subdevice *s, INT i_APCI1710_InsnBitsSSIDigitalIO(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.c
View file @ 34c43922
...@@ -131,7 +131,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc ...@@ -131,7 +131,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
*/ */
INT i_APCI1710_InsnConfigInitTorCounter(struct comedi_device * dev, INT i_APCI1710_InsnConfigInitTorCounter(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
ULONG ul_TimerValue = 0; ULONG ul_TimerValue = 0;
...@@ -988,7 +988,7 @@ INT i_APCI1710_InsnConfigInitTorCounter(struct comedi_device * dev, ...@@ -988,7 +988,7 @@ INT i_APCI1710_InsnConfigInitTorCounter(struct comedi_device * dev,
*/ */
INT i_APCI1710_InsnWriteEnableDisableTorCounter(struct comedi_device * dev, INT i_APCI1710_InsnWriteEnableDisableTorCounter(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
DWORD dw_Status; DWORD dw_Status;
...@@ -1461,7 +1461,7 @@ INT i_APCI1710_InsnWriteEnableDisableTorCounter(struct comedi_device * dev, ...@@ -1461,7 +1461,7 @@ INT i_APCI1710_InsnWriteEnableDisableTorCounter(struct comedi_device * dev,
*/ */
INT i_APCI1710_InsnReadGetTorCounterInitialisation(struct comedi_device * dev, INT i_APCI1710_InsnReadGetTorCounterInitialisation(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
DWORD dw_Status; DWORD dw_Status;
...@@ -1701,7 +1701,7 @@ INT i_APCI1710_InsnReadGetTorCounterInitialisation(struct comedi_device * dev, ...@@ -1701,7 +1701,7 @@ INT i_APCI1710_InsnReadGetTorCounterInitialisation(struct comedi_device * dev,
*/ */
INT i_APCI1710_InsnBitsGetTorCounterProgressStatusAndValue(struct comedi_device * dev, INT i_APCI1710_InsnBitsGetTorCounterProgressStatusAndValue(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
DWORD dw_Status; DWORD dw_Status;
......
drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.h
View file @ 34c43922
...@@ -36,22 +36,22 @@ ...@@ -36,22 +36,22 @@
* TOR_COUNTER INISIALISATION FUNCTION * TOR_COUNTER INISIALISATION FUNCTION
*/ */
INT i_APCI1710_InsnConfigInitTorCounter(struct comedi_device *dev, INT i_APCI1710_InsnConfigInitTorCounter(struct comedi_device *dev,
comedi_subdevice *s, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
INT i_APCI1710_InsnWriteEnableDisableTorCounter(struct comedi_device *dev, INT i_APCI1710_InsnWriteEnableDisableTorCounter(struct comedi_device *dev,
comedi_subdevice *s, struct comedi_subdevice *s,
comedi_insn *insn, comedi_insn *insn,
unsigned int *data); unsigned int *data);
INT i_APCI1710_InsnReadGetTorCounterInitialisation(struct comedi_device *dev, INT i_APCI1710_InsnReadGetTorCounterInitialisation(struct comedi_device *dev,
comedi_subdevice *s, struct comedi_subdevice *s,
comedi_insn *insn, comedi_insn *insn,
unsigned int *data); unsigned int *data);
/* /*
* TOR_COUNTER READ FUNCTION * TOR_COUNTER READ FUNCTION
*/ */
INT i_APCI1710_InsnBitsGetTorCounterProgressStatusAndValue(struct comedi_device *dev, INT i_APCI1710_InsnBitsGetTorCounterProgressStatusAndValue(struct comedi_device *dev,
comedi_subdevice *s, struct comedi_subdevice *s,
comedi_insn *insn, comedi_insn *insn,
unsigned int *data); unsigned int *data);
drivers/staging/comedi/drivers/addi-data/APCI1710_Ttl.c
View file @ 34c43922
...@@ -100,7 +100,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc ...@@ -100,7 +100,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_InsnConfigInitTTLIO(struct comedi_device * dev, comedi_subdevice * s, INT i_APCI1710_InsnConfigInitTTLIO(struct comedi_device * dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
...@@ -406,7 +406,7 @@ APCI1710_TTL_READCHANNEL ...@@ -406,7 +406,7 @@ APCI1710_TTL_READCHANNEL
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_InsnBitsReadTTLIO(struct comedi_device * dev, comedi_subdevice * s, INT i_APCI1710_InsnBitsReadTTLIO(struct comedi_device * dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
...@@ -634,7 +634,7 @@ INT i_APCI1710_InsnBitsReadTTLIO(struct comedi_device * dev, comedi_subdevice * ...@@ -634,7 +634,7 @@ INT i_APCI1710_InsnBitsReadTTLIO(struct comedi_device * dev, comedi_subdevice *
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : INT i_APCI1710_InsnReadTTLIOAllPortValue(comedi_device | Function Name : INT i_APCI1710_InsnReadTTLIOAllPortValue(comedi_device
*dev,comedi_subdevice *s,comedi_insn *insn,unsigned int *data) | *dev,struct comedi_subdevice *s,comedi_insn *insn,unsigned int *data) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Read the status from all digital input ports | | Task : Read the status from all digital input ports |
| (port A, port B and port C) from selected TTL | | (port A, port B and port C) from selected TTL |
...@@ -656,7 +656,7 @@ INT i_APCI1710_InsnBitsReadTTLIO(struct comedi_device * dev, comedi_subdevice * ...@@ -656,7 +656,7 @@ INT i_APCI1710_InsnBitsReadTTLIO(struct comedi_device * dev, comedi_subdevice *
*/ */
INT i_APCI1710_InsnReadTTLIOAllPortValue(struct comedi_device * dev, INT i_APCI1710_InsnReadTTLIOAllPortValue(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
DWORD dw_StatusReg; DWORD dw_StatusReg;
...@@ -792,7 +792,7 @@ INT i_APCI1710_InsnReadTTLIOAllPortValue(struct comedi_device * dev, ...@@ -792,7 +792,7 @@ INT i_APCI1710_InsnReadTTLIOAllPortValue(struct comedi_device * dev,
| (BYTE_ b_BoardHandle, | | (BYTE_ b_BoardHandle, |
| BYTE_ b_ModulNbr, | | BYTE_ b_ModulNbr, |
| BYTE_ b_OutputChannel) | BYTE_ b_OutputChannel)
INT i_APCI1710_InsnWriteSetTTLIOChlOnOff(struct comedi_device *dev,comedi_subdevice *s, INT i_APCI1710_InsnWriteSetTTLIOChlOnOff(struct comedi_device *dev,struct comedi_subdevice *s,
comedi_insn *insn,unsigned int *data) | comedi_insn *insn,unsigned int *data) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Sets or resets the output witch has been passed with the | | Task : Sets or resets the output witch has been passed with the |
...@@ -826,7 +826,7 @@ INT i_APCI1710_InsnWriteSetTTLIOChlOnOff(struct comedi_device *dev,comedi_subdev ...@@ -826,7 +826,7 @@ INT i_APCI1710_InsnWriteSetTTLIOChlOnOff(struct comedi_device *dev,comedi_subdev
*/ */
INT i_APCI1710_InsnWriteSetTTLIOChlOnOff(struct comedi_device * dev, INT i_APCI1710_InsnWriteSetTTLIOChlOnOff(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
DWORD dw_StatusReg = 0; DWORD dw_StatusReg = 0;
......
drivers/staging/comedi/drivers/addi-data/APCI1710_Ttl.h
View file @ 34c43922
...@@ -24,21 +24,21 @@ ...@@ -24,21 +24,21 @@
/* /*
* TTL INISIALISATION FUNCTION * TTL INISIALISATION FUNCTION
*/ */
INT i_APCI1710_InsnConfigInitTTLIO(struct comedi_device *dev, comedi_subdevice *s, INT i_APCI1710_InsnConfigInitTTLIO(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
/* /*
* TTL INPUT FUNCTION * TTL INPUT FUNCTION
*/ */
INT i_APCI1710_InsnBitsReadTTLIO(struct comedi_device *dev, comedi_subdevice *s, INT i_APCI1710_InsnBitsReadTTLIO(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
INT i_APCI1710_InsnReadTTLIOAllPortValue(struct comedi_device *dev, INT i_APCI1710_InsnReadTTLIOAllPortValue(struct comedi_device *dev,
comedi_subdevice *s, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
/* /*
* TTL OUTPUT FUNCTIONS * TTL OUTPUT FUNCTIONS
*/ */
INT i_APCI1710_InsnWriteSetTTLIOChlOnOff(struct comedi_device *dev, INT i_APCI1710_InsnWriteSetTTLIOChlOnOff(struct comedi_device *dev,
comedi_subdevice *s, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
drivers/staging/comedi/drivers/addi-data/addi_common.c
View file @ 34c43922
...@@ -2561,7 +2561,7 @@ COMEDI_PCI_INITCLEANUP(driver_addi, addi_apci_tbl); ...@@ -2561,7 +2561,7 @@ COMEDI_PCI_INITCLEANUP(driver_addi, addi_apci_tbl);
static int i_ADDI_Attach(struct comedi_device * dev, comedi_devconfig * it) static int i_ADDI_Attach(struct comedi_device * dev, comedi_devconfig * it)
{ {
comedi_subdevice *s; struct comedi_subdevice *s;
int ret, pages, i, n_subdevices; int ret, pages, i, n_subdevices;
DWORD dw_Dummy; DWORD dw_Dummy;
resource_size_t io_addr[5]; resource_size_t io_addr[5];
...@@ -3029,14 +3029,14 @@ static irqreturn_t v_ADDI_Interrupt(int irq, void *d PT_REGS_ARG) ...@@ -3029,14 +3029,14 @@ static irqreturn_t v_ADDI_Interrupt(int irq, void *d PT_REGS_ARG)
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function name : | | Function name : |
|INT i_ADDIDATA_InsnReadEeprom(struct comedi_device *dev,comedi_subdevice *s, |INT i_ADDIDATA_InsnReadEeprom(struct comedi_device *dev,struct comedi_subdevice *s,
comedi_insn *insn,unsigned int *data) comedi_insn *insn,unsigned int *data)
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Read 256 words from EEPROM | | Task : Read 256 words from EEPROM |
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters :(struct comedi_device *dev,comedi_subdevice *s, | Input Parameters :(struct comedi_device *dev,struct comedi_subdevice *s,
comedi_insn *insn,unsigned int *data) | comedi_insn *insn,unsigned int *data) |
| | | |
| | | |
...@@ -3046,7 +3046,7 @@ static irqreturn_t v_ADDI_Interrupt(int irq, void *d PT_REGS_ARG) ...@@ -3046,7 +3046,7 @@ static irqreturn_t v_ADDI_Interrupt(int irq, void *d PT_REGS_ARG)
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
static int i_ADDIDATA_InsnReadEeprom(struct comedi_device * dev, comedi_subdevice * s, static int i_ADDIDATA_InsnReadEeprom(struct comedi_device * dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
WORD w_Data; WORD w_Data;
......
drivers/staging/comedi/drivers/addi-data/addi_common.h
View file @ 34c43922
...@@ -118,103 +118,103 @@ typedef struct { ...@@ -118,103 +118,103 @@ typedef struct {
/* ANALOG INPUT */ /* ANALOG INPUT */
int (*i_hwdrv_InsnConfigAnalogInput)(struct comedi_device *dev, int (*i_hwdrv_InsnConfigAnalogInput)(struct comedi_device *dev,
comedi_subdevice *s, struct comedi_subdevice *s,
comedi_insn *insn, comedi_insn *insn,
unsigned int *data); unsigned int *data);
int (*i_hwdrv_InsnReadAnalogInput)(struct comedi_device *dev, int (*i_hwdrv_InsnReadAnalogInput)(struct comedi_device *dev,
comedi_subdevice *s, struct comedi_subdevice *s,
comedi_insn *insn, comedi_insn *insn,
unsigned int *data); unsigned int *data);
int (*i_hwdrv_InsnWriteAnalogInput)(struct comedi_device *dev, int (*i_hwdrv_InsnWriteAnalogInput)(struct comedi_device *dev,
comedi_subdevice *s, struct comedi_subdevice *s,
comedi_insn *insn, comedi_insn *insn,
unsigned int *data); unsigned int *data);
int (*i_hwdrv_InsnBitsAnalogInput)(struct comedi_device *dev, int (*i_hwdrv_InsnBitsAnalogInput)(struct comedi_device *dev,
comedi_subdevice *s, struct comedi_subdevice *s,
comedi_insn *insn, comedi_insn *insn,
unsigned int *data); unsigned int *data);
int (*i_hwdrv_CommandTestAnalogInput)(struct comedi_device *dev, int (*i_hwdrv_CommandTestAnalogInput)(struct comedi_device *dev,
comedi_subdevice *s, struct comedi_subdevice *s,
comedi_cmd *cmd); comedi_cmd *cmd);
int (*i_hwdrv_CommandAnalogInput)(struct comedi_device *dev, int (*i_hwdrv_CommandAnalogInput)(struct comedi_device *dev,
comedi_subdevice *s); struct comedi_subdevice *s);
int (*i_hwdrv_CancelAnalogInput)(struct comedi_device *dev, int (*i_hwdrv_CancelAnalogInput)(struct comedi_device *dev,
comedi_subdevice *s); struct comedi_subdevice *s);
/* Analog Output */ /* Analog Output */
int (*i_hwdrv_InsnConfigAnalogOutput)(struct comedi_device *dev, int (*i_hwdrv_InsnConfigAnalogOutput)(struct comedi_device *dev,
comedi_subdevice *s, struct comedi_subdevice *s,
comedi_insn *insn, comedi_insn *insn,
unsigned int *data); unsigned int *data);
int (*i_hwdrv_InsnWriteAnalogOutput)(struct comedi_device *dev, int (*i_hwdrv_InsnWriteAnalogOutput)(struct comedi_device *dev,
comedi_subdevice *s, struct comedi_subdevice *s,
comedi_insn *insn, comedi_insn *insn,
unsigned int *data); unsigned int *data);
int (*i_hwdrv_InsnBitsAnalogOutput)(struct comedi_device *dev, int (*i_hwdrv_InsnBitsAnalogOutput)(struct comedi_device *dev,
comedi_subdevice *s, struct comedi_subdevice *s,
comedi_insn *insn, comedi_insn *insn,
unsigned int *data); unsigned int *data);
/* Digital Input */ /* Digital Input */
int (*i_hwdrv_InsnConfigDigitalInput) (struct comedi_device *dev, int (*i_hwdrv_InsnConfigDigitalInput) (struct comedi_device *dev,
comedi_subdevice *s, struct comedi_subdevice *s,
comedi_insn *insn, comedi_insn *insn,
unsigned int *data); unsigned int *data);
int (*i_hwdrv_InsnReadDigitalInput) (struct comedi_device *dev, int (*i_hwdrv_InsnReadDigitalInput) (struct comedi_device *dev,
comedi_subdevice *s, struct comedi_subdevice *s,
comedi_insn *insn, comedi_insn *insn,
unsigned int *data); unsigned int *data);
int (*i_hwdrv_InsnWriteDigitalInput) (struct comedi_device *dev, int (*i_hwdrv_InsnWriteDigitalInput) (struct comedi_device *dev,
comedi_subdevice *s, struct comedi_subdevice *s,
comedi_insn *insn, comedi_insn *insn,
unsigned int *data); unsigned int *data);
int (*i_hwdrv_InsnBitsDigitalInput) (struct comedi_device *dev, int (*i_hwdrv_InsnBitsDigitalInput) (struct comedi_device *dev,
comedi_subdevice *s, struct comedi_subdevice *s,
comedi_insn *insn, comedi_insn *insn,
unsigned int *data); unsigned int *data);
/* Digital Output */ /* Digital Output */
int (*i_hwdrv_InsnConfigDigitalOutput)(struct comedi_device *dev, int (*i_hwdrv_InsnConfigDigitalOutput)(struct comedi_device *dev,
comedi_subdevice *s, struct comedi_subdevice *s,
comedi_insn *insn, comedi_insn *insn,
unsigned int *data); unsigned int *data);
int (*i_hwdrv_InsnWriteDigitalOutput)(struct comedi_device *dev, int (*i_hwdrv_InsnWriteDigitalOutput)(struct comedi_device *dev,
comedi_subdevice *s, struct comedi_subdevice *s,
comedi_insn *insn, comedi_insn *insn,
unsigned int *data); unsigned int *data);
int (*i_hwdrv_InsnBitsDigitalOutput)(struct comedi_device *dev, int (*i_hwdrv_InsnBitsDigitalOutput)(struct comedi_device *dev,
comedi_subdevice *s, struct comedi_subdevice *s,
comedi_insn *insn, comedi_insn *insn,
unsigned int *data); unsigned int *data);
int (*i_hwdrv_InsnReadDigitalOutput)(struct comedi_device *dev, int (*i_hwdrv_InsnReadDigitalOutput)(struct comedi_device *dev,
comedi_subdevice *s, struct comedi_subdevice *s,
comedi_insn *insn, comedi_insn *insn,
unsigned int *data); unsigned int *data);
/* TIMER */ /* TIMER */
int (*i_hwdrv_InsnConfigTimer)(struct comedi_device *dev, int (*i_hwdrv_InsnConfigTimer)(struct comedi_device *dev,
comedi_subdevice *s, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
int (*i_hwdrv_InsnWriteTimer)(struct comedi_device *dev, int (*i_hwdrv_InsnWriteTimer)(struct comedi_device *dev,
comedi_subdevice *s, comedi_insn *insn, struct comedi_subdevice *s, comedi_insn *insn,
unsigned int *data); unsigned int *data);
int (*i_hwdrv_InsnReadTimer)(struct comedi_device *dev, comedi_subdevice *s, int (*i_hwdrv_InsnReadTimer)(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
int (*i_hwdrv_InsnBitsTimer)(struct comedi_device *dev, comedi_subdevice *s, int (*i_hwdrv_InsnBitsTimer)(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
/* TTL IO */ /* TTL IO */
int (*i_hwdr_ConfigInitTTLIO)(struct comedi_device *dev, int (*i_hwdr_ConfigInitTTLIO)(struct comedi_device *dev,
comedi_subdevice *s, comedi_insn *insn, struct comedi_subdevice *s, comedi_insn *insn,
unsigned int *data); unsigned int *data);
int (*i_hwdr_ReadTTLIOBits)(struct comedi_device *dev, comedi_subdevice *s, int (*i_hwdr_ReadTTLIOBits)(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
int (*i_hwdr_ReadTTLIOAllPortValue)(struct comedi_device *dev, int (*i_hwdr_ReadTTLIOAllPortValue)(struct comedi_device *dev,
comedi_subdevice *s, struct comedi_subdevice *s,
comedi_insn *insn, comedi_insn *insn,
unsigned int *data); unsigned int *data);
int (*i_hwdr_WriteTTLIOChlOnOff)(struct comedi_device *dev, int (*i_hwdr_WriteTTLIOChlOnOff)(struct comedi_device *dev,
comedi_subdevice *s, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
} boardtype; } boardtype;
...@@ -461,5 +461,5 @@ static int i_ADDI_Detach(struct comedi_device *dev); ...@@ -461,5 +461,5 @@ static int i_ADDI_Detach(struct comedi_device *dev);
static int i_ADDI_Reset(struct comedi_device *dev); static int i_ADDI_Reset(struct comedi_device *dev);
static irqreturn_t v_ADDI_Interrupt(int irq, void *d PT_REGS_ARG); static irqreturn_t v_ADDI_Interrupt(int irq, void *d PT_REGS_ARG);
static int i_ADDIDATA_InsnReadEeprom(struct comedi_device *dev, comedi_subdevice *s, static int i_ADDIDATA_InsnReadEeprom(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.c
View file @ 34c43922
...@@ -58,7 +58,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc ...@@ -58,7 +58,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
void i_ADDI_AttachPCI1710(struct comedi_device * dev) void i_ADDI_AttachPCI1710(struct comedi_device * dev)
{ {
comedi_subdevice *s; struct comedi_subdevice *s;
int ret = 0; int ret = 0;
int n_subdevices = 9; int n_subdevices = 9;
......
drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.c
View file @ 34c43922
...@@ -58,7 +58,7 @@ INT i_Flag = 1; ...@@ -58,7 +58,7 @@ INT i_Flag = 1;
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI035_ConfigTimerWatchdog | | Function Name : int i_APCI035_ConfigTimerWatchdog |
| (struct comedi_device *dev,comedi_subdevice *s, | | (struct comedi_device *dev,struct comedi_subdevice *s, |
| comedi_insn *insn,unsigned int *data) | | comedi_insn *insn,unsigned int *data) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Configures The Timer , Counter or Watchdog | | Task : Configures The Timer , Counter or Watchdog |
...@@ -109,7 +109,7 @@ INT i_Flag = 1; ...@@ -109,7 +109,7 @@ INT i_Flag = 1;
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI035_ConfigTimerWatchdog(struct comedi_device * dev, comedi_subdevice * s, INT i_APCI035_ConfigTimerWatchdog(struct comedi_device * dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
UINT ui_Status = 0; UINT ui_Status = 0;
...@@ -254,7 +254,7 @@ INT i_APCI035_ConfigTimerWatchdog(struct comedi_device * dev, comedi_subdevice * ...@@ -254,7 +254,7 @@ INT i_APCI035_ConfigTimerWatchdog(struct comedi_device * dev, comedi_subdevice *
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI035_StartStopWriteTimerWatchdog | | Function Name : int i_APCI035_StartStopWriteTimerWatchdog |
| (struct comedi_device *dev,comedi_subdevice *s, | | (struct comedi_device *dev,struct comedi_subdevice *s, |
| comedi_insn *insn,unsigned int *data) | | comedi_insn *insn,unsigned int *data) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Start / Stop The Selected Timer , or Watchdog | | Task : Start / Stop The Selected Timer , or Watchdog |
...@@ -279,7 +279,7 @@ INT i_APCI035_ConfigTimerWatchdog(struct comedi_device * dev, comedi_subdevice * ...@@ -279,7 +279,7 @@ INT i_APCI035_ConfigTimerWatchdog(struct comedi_device * dev, comedi_subdevice *
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI035_StartStopWriteTimerWatchdog(struct comedi_device * dev, INT i_APCI035_StartStopWriteTimerWatchdog(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
UINT ui_Command = 0; UINT ui_Command = 0;
INT i_Count = 0; INT i_Count = 0;
...@@ -367,7 +367,7 @@ INT i_APCI035_StartStopWriteTimerWatchdog(struct comedi_device * dev, ...@@ -367,7 +367,7 @@ INT i_APCI035_StartStopWriteTimerWatchdog(struct comedi_device * dev,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI035_ReadTimerWatchdog | | Function Name : int i_APCI035_ReadTimerWatchdog |
| (struct comedi_device *dev,comedi_subdevice *s, | | (struct comedi_device *dev,struct comedi_subdevice *s, |
| comedi_insn *insn,unsigned int *data) | | comedi_insn *insn,unsigned int *data) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Read The Selected Timer , Counter or Watchdog | | Task : Read The Selected Timer , Counter or Watchdog |
...@@ -391,7 +391,7 @@ INT i_APCI035_StartStopWriteTimerWatchdog(struct comedi_device * dev, ...@@ -391,7 +391,7 @@ INT i_APCI035_StartStopWriteTimerWatchdog(struct comedi_device * dev,
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI035_ReadTimerWatchdog(struct comedi_device * dev, comedi_subdevice * s, INT i_APCI035_ReadTimerWatchdog(struct comedi_device * dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
UINT ui_Status = 0; // Status register UINT ui_Status = 0; // Status register
...@@ -427,13 +427,13 @@ INT i_APCI035_ReadTimerWatchdog(struct comedi_device * dev, comedi_subdevice * s ...@@ -427,13 +427,13 @@ INT i_APCI035_ReadTimerWatchdog(struct comedi_device * dev, comedi_subdevice * s
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : INT i_APCI035_ConfigAnalogInput | | Function Name : INT i_APCI035_ConfigAnalogInput |
| (struct comedi_device *dev,comedi_subdevice *s, | | (struct comedi_device *dev,struct comedi_subdevice *s, |
| comedi_insn *insn,unsigned int *data) | | comedi_insn *insn,unsigned int *data) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Configures The Analog Input Subdevice | | Task : Configures The Analog Input Subdevice |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : struct comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| comedi_subdevice *s : Subdevice Pointer | | struct comedi_subdevice *s : Subdevice Pointer |
| comedi_insn *insn : Insn Structure Pointer | | comedi_insn *insn : Insn Structure Pointer |
| unsigned int *data : Data Pointer contains | | unsigned int *data : Data Pointer contains |
| configuration parameters as below | | configuration parameters as below |
...@@ -447,7 +447,7 @@ INT i_APCI035_ReadTimerWatchdog(struct comedi_device * dev, comedi_subdevice * s ...@@ -447,7 +447,7 @@ INT i_APCI035_ReadTimerWatchdog(struct comedi_device * dev, comedi_subdevice * s
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI035_ConfigAnalogInput(struct comedi_device * dev, comedi_subdevice * s, INT i_APCI035_ConfigAnalogInput(struct comedi_device * dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
devpriv->tsk_Current = current; devpriv->tsk_Current = current;
...@@ -466,7 +466,7 @@ INT i_APCI035_ConfigAnalogInput(struct comedi_device * dev, comedi_subdevice * s ...@@ -466,7 +466,7 @@ INT i_APCI035_ConfigAnalogInput(struct comedi_device * dev, comedi_subdevice * s
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI035_ReadAnalogInput | | Function Name : int i_APCI035_ReadAnalogInput |
| (struct comedi_device *dev,comedi_subdevice *s, | | (struct comedi_device *dev,struct comedi_subdevice *s, |
| comedi_insn *insn,unsigned int *data) | | comedi_insn *insn,unsigned int *data) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Read value of the selected channel | | Task : Read value of the selected channel |
...@@ -484,7 +484,7 @@ INT i_APCI035_ConfigAnalogInput(struct comedi_device * dev, comedi_subdevice * s ...@@ -484,7 +484,7 @@ INT i_APCI035_ConfigAnalogInput(struct comedi_device * dev, comedi_subdevice * s
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI035_ReadAnalogInput(struct comedi_device * dev, comedi_subdevice * s, INT i_APCI035_ReadAnalogInput(struct comedi_device * dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
UINT ui_CommandRegister = 0; UINT ui_CommandRegister = 0;
......
drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.h
View file @ 34c43922
...@@ -101,19 +101,19 @@ comedi_lrange range_apci035_ai = { 8, { ...@@ -101,19 +101,19 @@ comedi_lrange range_apci035_ai = { 8, {
/* TIMER */ /* TIMER */
/* timer value is passed as u seconds */ /* timer value is passed as u seconds */
INT i_APCI035_ConfigTimerWatchdog(struct comedi_device *dev, comedi_subdevice *s, INT i_APCI035_ConfigTimerWatchdog(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
INT i_APCI035_StartStopWriteTimerWatchdog(struct comedi_device *dev, INT i_APCI035_StartStopWriteTimerWatchdog(struct comedi_device *dev,
comedi_subdevice *s, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
INT i_APCI035_ReadTimerWatchdog(struct comedi_device *dev, comedi_subdevice *s, INT i_APCI035_ReadTimerWatchdog(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
/* Temperature Related Defines (Analog Input Subdevice) */ /* Temperature Related Defines (Analog Input Subdevice) */
INT i_APCI035_ConfigAnalogInput(struct comedi_device *dev, comedi_subdevice *s, INT i_APCI035_ConfigAnalogInput(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
INT i_APCI035_ReadAnalogInput(struct comedi_device *dev, comedi_subdevice *s, INT i_APCI035_ReadAnalogInput(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
/* Interrupt */ /* Interrupt */
......
drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c
View file @ 34c43922
...@@ -59,7 +59,7 @@ UINT ui_InterruptStatus = 0; ...@@ -59,7 +59,7 @@ UINT ui_InterruptStatus = 0;
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI1032_ConfigDigitalInput | | Function Name : int i_APCI1032_ConfigDigitalInput |
| (struct comedi_device *dev,comedi_subdevice *s, | | (struct comedi_device *dev,struct comedi_subdevice *s, |
| comedi_insn *insn,unsigned int *data) | | comedi_insn *insn,unsigned int *data) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Configures the digital input Subdevice | | Task : Configures the digital input Subdevice |
...@@ -84,7 +84,7 @@ UINT ui_InterruptStatus = 0; ...@@ -84,7 +84,7 @@ UINT ui_InterruptStatus = 0;
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1032_ConfigDigitalInput(struct comedi_device * dev, comedi_subdevice * s, INT i_APCI1032_ConfigDigitalInput(struct comedi_device * dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
UINT ui_TmpValue; UINT ui_TmpValue;
...@@ -128,7 +128,7 @@ INT i_APCI1032_ConfigDigitalInput(struct comedi_device * dev, comedi_subdevice * ...@@ -128,7 +128,7 @@ INT i_APCI1032_ConfigDigitalInput(struct comedi_device * dev, comedi_subdevice *
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI1032_Read1DigitalInput | | Function Name : int i_APCI1032_Read1DigitalInput |
| (struct comedi_device *dev,comedi_subdevice *s, | | (struct comedi_device *dev,struct comedi_subdevice *s, |
| comedi_insn *insn,unsigned int *data) | | comedi_insn *insn,unsigned int *data) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Return the status of the digital input | | Task : Return the status of the digital input |
...@@ -144,7 +144,7 @@ INT i_APCI1032_ConfigDigitalInput(struct comedi_device * dev, comedi_subdevice * ...@@ -144,7 +144,7 @@ INT i_APCI1032_ConfigDigitalInput(struct comedi_device * dev, comedi_subdevice *
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1032_Read1DigitalInput(struct comedi_device * dev, comedi_subdevice * s, INT i_APCI1032_Read1DigitalInput(struct comedi_device * dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
UINT ui_TmpValue = 0; UINT ui_TmpValue = 0;
...@@ -166,7 +166,7 @@ INT i_APCI1032_Read1DigitalInput(struct comedi_device * dev, comedi_subdevice * ...@@ -166,7 +166,7 @@ INT i_APCI1032_Read1DigitalInput(struct comedi_device * dev, comedi_subdevice *
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI1032_ReadMoreDigitalInput | | Function Name : int i_APCI1032_ReadMoreDigitalInput |
| (struct comedi_device *dev,comedi_subdevice *s, | | (struct comedi_device *dev,struct comedi_subdevice *s, |
| comedi_insn *insn,unsigned int *data) | | comedi_insn *insn,unsigned int *data) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Return the status of the Requested digital inputs | | Task : Return the status of the Requested digital inputs |
...@@ -183,7 +183,7 @@ INT i_APCI1032_Read1DigitalInput(struct comedi_device * dev, comedi_subdevice * ...@@ -183,7 +183,7 @@ INT i_APCI1032_Read1DigitalInput(struct comedi_device * dev, comedi_subdevice *
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1032_ReadMoreDigitalInput(struct comedi_device * dev, comedi_subdevice * s, INT i_APCI1032_ReadMoreDigitalInput(struct comedi_device * dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
UINT ui_PortValue = data[0]; UINT ui_PortValue = data[0];
......
drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.h
View file @ 34c43922
...@@ -47,13 +47,13 @@ ...@@ -47,13 +47,13 @@
//DI //DI
// for di read // for di read
INT i_APCI1032_ConfigDigitalInput(struct comedi_device *dev, comedi_subdevice *s, INT i_APCI1032_ConfigDigitalInput(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
INT i_APCI1032_Read1DigitalInput(struct comedi_device *dev, comedi_subdevice *s, INT i_APCI1032_Read1DigitalInput(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
INT i_APCI1032_ReadMoreDigitalInput(struct comedi_device *dev, comedi_subdevice *s, INT i_APCI1032_ReadMoreDigitalInput(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
// Interrupt functions..... // Interrupt functions.....
......
drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.h
View file @ 34c43922
...@@ -116,50 +116,50 @@ enum { ...@@ -116,50 +116,50 @@ enum {
}; };
/*----------DIGITAL INPUT----------------*/ /*----------DIGITAL INPUT----------------*/
static int i_APCI1500_Initialisation(struct comedi_device *dev, comedi_subdevice *s, static int i_APCI1500_Initialisation(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
static int i_APCI1500_ConfigDigitalInputEvent(struct comedi_device *dev, static int i_APCI1500_ConfigDigitalInputEvent(struct comedi_device *dev,
comedi_subdevice *s, struct comedi_subdevice *s,
comedi_insn *insn, comedi_insn *insn,
unsigned int *data); unsigned int *data);
static int i_APCI1500_StartStopInputEvent(struct comedi_device *dev, static int i_APCI1500_StartStopInputEvent(struct comedi_device *dev,
comedi_subdevice *s, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
static int i_APCI1500_ReadMoreDigitalInput(struct comedi_device *dev, static int i_APCI1500_ReadMoreDigitalInput(struct comedi_device *dev,
comedi_subdevice *s, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
/*---------- DIGITAL OUTPUT------------*/ /*---------- DIGITAL OUTPUT------------*/
static int i_APCI1500_ConfigDigitalOutputErrorInterrupt(struct comedi_device *dev, static int i_APCI1500_ConfigDigitalOutputErrorInterrupt(struct comedi_device *dev,
comedi_subdevice *s, struct comedi_subdevice *s,
comedi_insn *insn, comedi_insn *insn,
unsigned int *data); unsigned int *data);
static int i_APCI1500_WriteDigitalOutput(struct comedi_device *dev, static int i_APCI1500_WriteDigitalOutput(struct comedi_device *dev,
comedi_subdevice *s, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
/*----------TIMER----------------*/ /*----------TIMER----------------*/
static int i_APCI1500_ConfigCounterTimerWatchdog(struct comedi_device *dev, static int i_APCI1500_ConfigCounterTimerWatchdog(struct comedi_device *dev,
comedi_subdevice *s, struct comedi_subdevice *s,
comedi_insn *insn, comedi_insn *insn,
unsigned int *data); unsigned int *data);
static int i_APCI1500_StartStopTriggerTimerCounterWatchdog(struct comedi_device *dev, static int i_APCI1500_StartStopTriggerTimerCounterWatchdog(struct comedi_device *dev,
comedi_subdevice *s, struct comedi_subdevice *s,
comedi_insn *insn, comedi_insn *insn,
unsigned int *data); unsigned int *data);
static int i_APCI1500_ReadCounterTimerWatchdog(struct comedi_device *dev, static int i_APCI1500_ReadCounterTimerWatchdog(struct comedi_device *dev,
comedi_subdevice *s, struct comedi_subdevice *s,
comedi_insn *insn, comedi_insn *insn,
unsigned int *data); unsigned int *data);
static int i_APCI1500_ReadInterruptMask(struct comedi_device *dev, static int i_APCI1500_ReadInterruptMask(struct comedi_device *dev,
comedi_subdevice *s, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
/*----------INTERRUPT HANDLER------*/ /*----------INTERRUPT HANDLER------*/
static void v_APCI1500_Interrupt(int irq, void *d); static void v_APCI1500_Interrupt(int irq, void *d);
static int i_APCI1500_ConfigureInterrupt(struct comedi_device *dev, static int i_APCI1500_ConfigureInterrupt(struct comedi_device *dev,
comedi_subdevice *s, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
/*----------RESET---------------*/ /*----------RESET---------------*/
static int i_APCI1500_Reset(struct comedi_device *dev); static int i_APCI1500_Reset(struct comedi_device *dev);
drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.h
View file @ 34c43922
...@@ -38,26 +38,26 @@ ...@@ -38,26 +38,26 @@
// Hardware Layer functions for Apci1516 // Hardware Layer functions for Apci1516
//Digital Input //Digital Input
INT i_APCI1516_ReadMoreDigitalInput(struct comedi_device *dev, comedi_subdevice *s, INT i_APCI1516_ReadMoreDigitalInput(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
INT i_APCI1516_Read1DigitalInput(struct comedi_device *dev, comedi_subdevice *s, INT i_APCI1516_Read1DigitalInput(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
//Digital Output //Digital Output
int i_APCI1516_ConfigDigitalOutput(struct comedi_device *dev, comedi_subdevice *s, int i_APCI1516_ConfigDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
INT i_APCI1516_WriteDigitalOutput(struct comedi_device *dev, comedi_subdevice *s, INT i_APCI1516_WriteDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
INT i_APCI1516_ReadDigitalOutput(struct comedi_device *dev, comedi_subdevice *s, INT i_APCI1516_ReadDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
// TIMER // TIMER
// timer value is passed as u seconds // timer value is passed as u seconds
int i_APCI1516_ConfigWatchdog(struct comedi_device *dev, comedi_subdevice *s, int i_APCI1516_ConfigWatchdog(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
int i_APCI1516_StartStopWriteWatchdog(struct comedi_device *dev, comedi_subdevice *s, int i_APCI1516_StartStopWriteWatchdog(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
int i_APCI1516_ReadWatchdog(struct comedi_device *dev, comedi_subdevice *s, int i_APCI1516_ReadWatchdog(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
//reset //reset
......
drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.h
View file @ 34c43922
...@@ -82,34 +82,34 @@ ...@@ -82,34 +82,34 @@
//DI //DI
// for di read // for di read
INT i_APCI1564_ConfigDigitalInput(struct comedi_device *dev, comedi_subdevice *s, INT i_APCI1564_ConfigDigitalInput(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
INT i_APCI1564_Read1DigitalInput(struct comedi_device *dev, comedi_subdevice *s, INT i_APCI1564_Read1DigitalInput(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
INT i_APCI1564_ReadMoreDigitalInput(struct comedi_device *dev, comedi_subdevice *s, INT i_APCI1564_ReadMoreDigitalInput(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
//DO //DO
int i_APCI1564_ConfigDigitalOutput(struct comedi_device *dev, comedi_subdevice *s, int i_APCI1564_ConfigDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
INT i_APCI1564_WriteDigitalOutput(struct comedi_device *dev, comedi_subdevice *s, INT i_APCI1564_WriteDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
INT i_APCI1564_ReadDigitalOutput(struct comedi_device *dev, comedi_subdevice *s, INT i_APCI1564_ReadDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
int i_APCI1564_ReadInterruptStatus(struct comedi_device *dev, comedi_subdevice *s, int i_APCI1564_ReadInterruptStatus(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
// TIMER // TIMER
// timer value is passed as u seconds // timer value is passed as u seconds
INT i_APCI1564_ConfigTimerCounterWatchdog(struct comedi_device *dev, INT i_APCI1564_ConfigTimerCounterWatchdog(struct comedi_device *dev,
comedi_subdevice *s, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
int i_APCI1564_StartStopWriteTimerCounterWatchdog(struct comedi_device *dev, int i_APCI1564_StartStopWriteTimerCounterWatchdog(struct comedi_device *dev,
comedi_subdevice *s, struct comedi_subdevice *s,
comedi_insn *insn, comedi_insn *insn,
unsigned int *data); unsigned int *data);
int i_APCI1564_ReadTimerCounterWatchdog(struct comedi_device *dev, int i_APCI1564_ReadTimerCounterWatchdog(struct comedi_device *dev,
comedi_subdevice *s, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
// INTERRUPT // INTERRUPT
......
drivers/staging/comedi/drivers/addi-data/hwdrv_apci16xx.c
View file @ 34c43922
...@@ -59,7 +59,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc ...@@ -59,7 +59,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : INT i_APCI16XX_InsnConfigInitTTLIO | | Function Name : INT i_APCI16XX_InsnConfigInitTTLIO |
| (struct comedi_device *dev, | | (struct comedi_device *dev, |
| comedi_subdevice *s, | | struct comedi_subdevice *s, |
| comedi_insn *insn, | | comedi_insn *insn, |
| unsigned int *data) | | unsigned int *data) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
...@@ -91,7 +91,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc ...@@ -91,7 +91,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
*/ */
int i_APCI16XX_InsnConfigInitTTLIO(struct comedi_device * dev, int i_APCI16XX_InsnConfigInitTTLIO(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
INT i_ReturnValue = insn->n; INT i_ReturnValue = insn->n;
BYTE b_Command = 0; BYTE b_Command = 0;
...@@ -252,7 +252,7 @@ int i_APCI16XX_InsnConfigInitTTLIO(struct comedi_device * dev, ...@@ -252,7 +252,7 @@ int i_APCI16XX_InsnConfigInitTTLIO(struct comedi_device * dev,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : INT i_APCI16XX_InsnBitsReadTTLIO | | Function Name : INT i_APCI16XX_InsnBitsReadTTLIO |
| (struct comedi_device *dev, | | (struct comedi_device *dev, |
| comedi_subdevice *s, | | struct comedi_subdevice *s, |
| comedi_insn *insn, | | comedi_insn *insn, |
| unsigned int *data) | | unsigned int *data) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
...@@ -284,7 +284,7 @@ int i_APCI16XX_InsnConfigInitTTLIO(struct comedi_device * dev, ...@@ -284,7 +284,7 @@ int i_APCI16XX_InsnConfigInitTTLIO(struct comedi_device * dev,
*/ */
int i_APCI16XX_InsnBitsReadTTLIO(struct comedi_device * dev, int i_APCI16XX_InsnBitsReadTTLIO(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
INT i_ReturnValue = insn->n; INT i_ReturnValue = insn->n;
BYTE b_Command = 0; BYTE b_Command = 0;
...@@ -412,7 +412,7 @@ int i_APCI16XX_InsnBitsReadTTLIO(struct comedi_device * dev, ...@@ -412,7 +412,7 @@ int i_APCI16XX_InsnBitsReadTTLIO(struct comedi_device * dev,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : INT i_APCI16XX_InsnReadTTLIOAllPortValue | | Function Name : INT i_APCI16XX_InsnReadTTLIOAllPortValue |
| (struct comedi_device *dev, | | (struct comedi_device *dev, |
| comedi_subdevice *s, | | struct comedi_subdevice *s, |
| comedi_insn *insn, | | comedi_insn *insn, |
| unsigned int *data) | | unsigned int *data) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
...@@ -431,7 +431,7 @@ int i_APCI16XX_InsnBitsReadTTLIO(struct comedi_device * dev, ...@@ -431,7 +431,7 @@ int i_APCI16XX_InsnBitsReadTTLIO(struct comedi_device * dev,
*/ */
int i_APCI16XX_InsnReadTTLIOAllPortValue(struct comedi_device * dev, int i_APCI16XX_InsnReadTTLIOAllPortValue(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
BYTE b_Command = (BYTE) CR_AREF(insn->chanspec); BYTE b_Command = (BYTE) CR_AREF(insn->chanspec);
INT i_ReturnValue = insn->n; INT i_ReturnValue = insn->n;
...@@ -537,7 +537,7 @@ int i_APCI16XX_InsnReadTTLIOAllPortValue(struct comedi_device * dev, ...@@ -537,7 +537,7 @@ int i_APCI16XX_InsnReadTTLIOAllPortValue(struct comedi_device * dev,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : INT i_APCI16XX_InsnBitsWriteTTLIO | | Function Name : INT i_APCI16XX_InsnBitsWriteTTLIO |
| (struct comedi_device *dev, | | (struct comedi_device *dev, |
| comedi_subdevice *s, | | struct comedi_subdevice *s, |
| comedi_insn *insn, | | comedi_insn *insn, |
| unsigned int *data) | | unsigned int *data) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
...@@ -571,7 +571,7 @@ int i_APCI16XX_InsnReadTTLIOAllPortValue(struct comedi_device * dev, ...@@ -571,7 +571,7 @@ int i_APCI16XX_InsnReadTTLIOAllPortValue(struct comedi_device * dev,
*/ */
int i_APCI16XX_InsnBitsWriteTTLIO(struct comedi_device * dev, int i_APCI16XX_InsnBitsWriteTTLIO(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
INT i_ReturnValue = insn->n; INT i_ReturnValue = insn->n;
BYTE b_Command = 0; BYTE b_Command = 0;
......
drivers/staging/comedi/drivers/addi-data/hwdrv_apci16xx.h
View file @ 34c43922
...@@ -63,7 +63,7 @@ static const comedi_lrange range_apci16xx_ttl = { 12, ...@@ -63,7 +63,7 @@ static const comedi_lrange range_apci16xx_ttl = { 12,
*/ */
int i_APCI16XX_InsnConfigInitTTLIO(struct comedi_device *dev, int i_APCI16XX_InsnConfigInitTTLIO(struct comedi_device *dev,
comedi_subdevice *s, comedi_insn *insn, struct comedi_subdevice *s, comedi_insn *insn,
unsigned int *data); unsigned int *data);
/* /*
...@@ -73,11 +73,11 @@ int i_APCI16XX_InsnConfigInitTTLIO(struct comedi_device *dev, ...@@ -73,11 +73,11 @@ int i_APCI16XX_InsnConfigInitTTLIO(struct comedi_device *dev,
*/ */
int i_APCI16XX_InsnBitsReadTTLIO(struct comedi_device *dev, int i_APCI16XX_InsnBitsReadTTLIO(struct comedi_device *dev,
comedi_subdevice *s, comedi_insn *insn, struct comedi_subdevice *s, comedi_insn *insn,
unsigned int *data); unsigned int *data);
int i_APCI16XX_InsnReadTTLIOAllPortValue(struct comedi_device *dev, int i_APCI16XX_InsnReadTTLIOAllPortValue(struct comedi_device *dev,
comedi_subdevice *s, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
/* /*
...@@ -87,7 +87,7 @@ int i_APCI16XX_InsnReadTTLIOAllPortValue(struct comedi_device *dev, ...@@ -87,7 +87,7 @@ int i_APCI16XX_InsnReadTTLIOAllPortValue(struct comedi_device *dev,
*/ */
int i_APCI16XX_InsnBitsWriteTTLIO(struct comedi_device *dev, int i_APCI16XX_InsnBitsWriteTTLIO(struct comedi_device *dev,
comedi_subdevice *s, comedi_insn *insn, struct comedi_subdevice *s, comedi_insn *insn,
unsigned int *data); unsigned int *data);
int i_APCI16XX_Reset(struct comedi_device *dev); int i_APCI16XX_Reset(struct comedi_device *dev);
......
drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.c
View file @ 34c43922
...@@ -56,7 +56,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc ...@@ -56,7 +56,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI2016_ConfigDigitalOutput | | Function Name : int i_APCI2016_ConfigDigitalOutput |
| (struct comedi_device *dev,comedi_subdevice *s, | | (struct comedi_device *dev,struct comedi_subdevice *s, |
| comedi_insn *insn,unsigned int *data) | | comedi_insn *insn,unsigned int *data) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Configures The Digital Output Subdevice. | | Task : Configures The Digital Output Subdevice. |
...@@ -75,7 +75,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc ...@@ -75,7 +75,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI2016_ConfigDigitalOutput(struct comedi_device * dev, comedi_subdevice * s, int i_APCI2016_ConfigDigitalOutput(struct comedi_device * dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
if ((data[0] != 0) && (data[0] != 1)) { if ((data[0] != 0) && (data[0] != 1)) {
...@@ -95,7 +95,7 @@ int i_APCI2016_ConfigDigitalOutput(struct comedi_device * dev, comedi_subdevice ...@@ -95,7 +95,7 @@ int i_APCI2016_ConfigDigitalOutput(struct comedi_device * dev, comedi_subdevice
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI2016_WriteDigitalOutput | | Function Name : int i_APCI2016_WriteDigitalOutput |
| (struct comedi_device *dev,comedi_subdevice *s, | | (struct comedi_device *dev,struct comedi_subdevice *s, |
| comedi_insn *insn,unsigned int *data) | | comedi_insn *insn,unsigned int *data) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Writes port value To the selected port | | Task : Writes port value To the selected port |
...@@ -111,7 +111,7 @@ int i_APCI2016_ConfigDigitalOutput(struct comedi_device * dev, comedi_subdevice ...@@ -111,7 +111,7 @@ int i_APCI2016_ConfigDigitalOutput(struct comedi_device * dev, comedi_subdevice
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI2016_WriteDigitalOutput(struct comedi_device * dev, comedi_subdevice * s, int i_APCI2016_WriteDigitalOutput(struct comedi_device * dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
UINT ui_NoOfChannel; UINT ui_NoOfChannel;
...@@ -250,7 +250,7 @@ int i_APCI2016_WriteDigitalOutput(struct comedi_device * dev, comedi_subdevice * ...@@ -250,7 +250,7 @@ int i_APCI2016_WriteDigitalOutput(struct comedi_device * dev, comedi_subdevice *
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI2016_BitsDigitalOutput | | Function Name : int i_APCI2016_BitsDigitalOutput |
| (struct comedi_device *dev,comedi_subdevice *s, | | (struct comedi_device *dev,struct comedi_subdevice *s, |
| comedi_insn *insn,unsigned int *data) | | comedi_insn *insn,unsigned int *data) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Read value of the selected channel or port | | Task : Read value of the selected channel or port |
...@@ -266,7 +266,7 @@ int i_APCI2016_WriteDigitalOutput(struct comedi_device * dev, comedi_subdevice * ...@@ -266,7 +266,7 @@ int i_APCI2016_WriteDigitalOutput(struct comedi_device * dev, comedi_subdevice *
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI2016_BitsDigitalOutput(struct comedi_device * dev, comedi_subdevice * s, int i_APCI2016_BitsDigitalOutput(struct comedi_device * dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
UINT ui_Temp; UINT ui_Temp;
...@@ -320,13 +320,13 @@ int i_APCI2016_BitsDigitalOutput(struct comedi_device * dev, comedi_subdevice * ...@@ -320,13 +320,13 @@ int i_APCI2016_BitsDigitalOutput(struct comedi_device * dev, comedi_subdevice *
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI2016_ConfigWatchdog | | Function Name : int i_APCI2016_ConfigWatchdog |
| (struct comedi_device *dev,comedi_subdevice *s, | | (struct comedi_device *dev,struct comedi_subdevice *s, |
| comedi_insn *insn,unsigned int *data) | | comedi_insn *insn,unsigned int *data) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Configures The Watchdog | | Task : Configures The Watchdog |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : struct comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| comedi_subdevice *s, :pointer to subdevice structure | | struct comedi_subdevice *s, :pointer to subdevice structure |
| comedi_insn *insn :pointer to insn structure | | comedi_insn *insn :pointer to insn structure |
| unsigned int *data : Data Pointer to read status | | unsigned int *data : Data Pointer to read status |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
...@@ -337,7 +337,7 @@ int i_APCI2016_BitsDigitalOutput(struct comedi_device * dev, comedi_subdevice * ...@@ -337,7 +337,7 @@ int i_APCI2016_BitsDigitalOutput(struct comedi_device * dev, comedi_subdevice *
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI2016_ConfigWatchdog(struct comedi_device * dev, comedi_subdevice * s, int i_APCI2016_ConfigWatchdog(struct comedi_device * dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
...@@ -363,13 +363,13 @@ int i_APCI2016_ConfigWatchdog(struct comedi_device * dev, comedi_subdevice * s, ...@@ -363,13 +363,13 @@ int i_APCI2016_ConfigWatchdog(struct comedi_device * dev, comedi_subdevice * s,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI2016_StartStopWriteWatchdog | | Function Name : int i_APCI2016_StartStopWriteWatchdog |
| (struct comedi_device *dev,comedi_subdevice *s, | | (struct comedi_device *dev,struct comedi_subdevice *s, |
| comedi_insn *insn,unsigned int *data) | | comedi_insn *insn,unsigned int *data) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Start / Stop The Watchdog | | Task : Start / Stop The Watchdog |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : struct comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| comedi_subdevice *s, :pointer to subdevice structure | | struct comedi_subdevice *s, :pointer to subdevice structure |
| comedi_insn *insn :pointer to insn structure | | comedi_insn *insn :pointer to insn structure |
| unsigned int *data : Data Pointer to read status | | unsigned int *data : Data Pointer to read status |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
...@@ -380,7 +380,7 @@ int i_APCI2016_ConfigWatchdog(struct comedi_device * dev, comedi_subdevice * s, ...@@ -380,7 +380,7 @@ int i_APCI2016_ConfigWatchdog(struct comedi_device * dev, comedi_subdevice * s,
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI2016_StartStopWriteWatchdog(struct comedi_device * dev, comedi_subdevice * s, int i_APCI2016_StartStopWriteWatchdog(struct comedi_device * dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
...@@ -409,13 +409,13 @@ int i_APCI2016_StartStopWriteWatchdog(struct comedi_device * dev, comedi_subdevi ...@@ -409,13 +409,13 @@ int i_APCI2016_StartStopWriteWatchdog(struct comedi_device * dev, comedi_subdevi
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI2016_ReadWatchdog | | Function Name : int i_APCI2016_ReadWatchdog |
| (struct comedi_device *dev,comedi_subdevice *s, | | (struct comedi_device *dev,struct comedi_subdevice *s, |
| comedi_insn *insn,unsigned int *data) | | comedi_insn *insn,unsigned int *data) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Read The Watchdog | | Task : Read The Watchdog |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : struct comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| comedi_subdevice *s, :pointer to subdevice structure | | struct comedi_subdevice *s, :pointer to subdevice structure |
| comedi_insn *insn :pointer to insn structure | | comedi_insn *insn :pointer to insn structure |
| unsigned int *data : Data Pointer to read status | | unsigned int *data : Data Pointer to read status |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
...@@ -427,7 +427,7 @@ int i_APCI2016_StartStopWriteWatchdog(struct comedi_device * dev, comedi_subdevi ...@@ -427,7 +427,7 @@ int i_APCI2016_StartStopWriteWatchdog(struct comedi_device * dev, comedi_subdevi
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI2016_ReadWatchdog(struct comedi_device * dev, comedi_subdevice * s, int i_APCI2016_ReadWatchdog(struct comedi_device * dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
udelay(5); udelay(5);
......
drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.h
View file @ 34c43922
...@@ -40,25 +40,25 @@ ...@@ -40,25 +40,25 @@
// Hardware Layer functions for Apci2016 // Hardware Layer functions for Apci2016
//DO //DO
int i_APCI2016_ConfigDigitalOutput(struct comedi_device *dev, comedi_subdevice *s, int i_APCI2016_ConfigDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
int i_APCI2016_WriteDigitalOutput(struct comedi_device *dev, comedi_subdevice *s, int i_APCI2016_WriteDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
int i_APCI2016_BitsDigitalOutput(struct comedi_device *dev, comedi_subdevice *s, int i_APCI2016_BitsDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
// TIMER // TIMER
// timer value is passed as u seconds // timer value is passed as u seconds
int i_APCI2016_ConfigWatchdog(struct comedi_device *dev, comedi_subdevice *s, int i_APCI2016_ConfigWatchdog(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
int i_APCI2016_StartStopWriteWatchdog(struct comedi_device *dev, comedi_subdevice *s, int i_APCI2016_StartStopWriteWatchdog(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
int i_APCI2016_ReadWatchdog(struct comedi_device *dev, comedi_subdevice *s, int i_APCI2016_ReadWatchdog(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
// Interrupt functions..... // Interrupt functions.....
......
drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.c
View file @ 34c43922
...@@ -57,7 +57,7 @@ UINT ui_InterruptData, ui_Type; ...@@ -57,7 +57,7 @@ UINT ui_InterruptData, ui_Type;
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI2032_ConfigDigitalOutput | | Function Name : int i_APCI2032_ConfigDigitalOutput |
| (struct comedi_device *dev,comedi_subdevice *s, | | (struct comedi_device *dev,struct comedi_subdevice *s, |
| comedi_insn *insn,unsigned int *data) | | comedi_insn *insn,unsigned int *data) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Configures The Digital Output Subdevice. | | Task : Configures The Digital Output Subdevice. |
...@@ -79,7 +79,7 @@ UINT ui_InterruptData, ui_Type; ...@@ -79,7 +79,7 @@ UINT ui_InterruptData, ui_Type;
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI2032_ConfigDigitalOutput(struct comedi_device * dev, comedi_subdevice * s, int i_APCI2032_ConfigDigitalOutput(struct comedi_device * dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
ULONG ul_Command = 0; ULONG ul_Command = 0;
...@@ -117,7 +117,7 @@ int i_APCI2032_ConfigDigitalOutput(struct comedi_device * dev, comedi_subdevice ...@@ -117,7 +117,7 @@ int i_APCI2032_ConfigDigitalOutput(struct comedi_device * dev, comedi_subdevice
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI2032_WriteDigitalOutput | | Function Name : int i_APCI2032_WriteDigitalOutput |
| (struct comedi_device *dev,comedi_subdevice *s, | | (struct comedi_device *dev,struct comedi_subdevice *s, |
| comedi_insn *insn,unsigned int *data) | | comedi_insn *insn,unsigned int *data) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Writes port value To the selected port | | Task : Writes port value To the selected port |
...@@ -134,7 +134,7 @@ int i_APCI2032_ConfigDigitalOutput(struct comedi_device * dev, comedi_subdevice ...@@ -134,7 +134,7 @@ int i_APCI2032_ConfigDigitalOutput(struct comedi_device * dev, comedi_subdevice
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI2032_WriteDigitalOutput(struct comedi_device * dev, comedi_subdevice * s, INT i_APCI2032_WriteDigitalOutput(struct comedi_device * dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
UINT ui_Temp, ui_Temp1; UINT ui_Temp, ui_Temp1;
...@@ -296,7 +296,7 @@ INT i_APCI2032_WriteDigitalOutput(struct comedi_device * dev, comedi_subdevice * ...@@ -296,7 +296,7 @@ INT i_APCI2032_WriteDigitalOutput(struct comedi_device * dev, comedi_subdevice *
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI2032_ReadDigitalOutput | | Function Name : int i_APCI2032_ReadDigitalOutput |
| (struct comedi_device *dev,comedi_subdevice *s, | | (struct comedi_device *dev,struct comedi_subdevice *s, |
| comedi_insn *insn,unsigned int *data) | | comedi_insn *insn,unsigned int *data) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Read value of the selected channel or port | | Task : Read value of the selected channel or port |
...@@ -313,7 +313,7 @@ INT i_APCI2032_WriteDigitalOutput(struct comedi_device * dev, comedi_subdevice * ...@@ -313,7 +313,7 @@ INT i_APCI2032_WriteDigitalOutput(struct comedi_device * dev, comedi_subdevice *
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI2032_ReadDigitalOutput(struct comedi_device * dev, comedi_subdevice * s, INT i_APCI2032_ReadDigitalOutput(struct comedi_device * dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
UINT ui_Temp; UINT ui_Temp;
...@@ -363,13 +363,13 @@ INT i_APCI2032_ReadDigitalOutput(struct comedi_device * dev, comedi_subdevice * ...@@ -363,13 +363,13 @@ INT i_APCI2032_ReadDigitalOutput(struct comedi_device * dev, comedi_subdevice *
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : INT i_APCI2032_ConfigWatchdog(comedi_device | Function Name : INT i_APCI2032_ConfigWatchdog(comedi_device
*dev,comedi_subdevice *s,comedi_insn *insn,unsigned int *data)| *dev,struct comedi_subdevice *s,comedi_insn *insn,unsigned int *data)|
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Configures The Watchdog | | Task : Configures The Watchdog |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : struct comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| comedi_subdevice *s, :pointer to subdevice structure | struct comedi_subdevice *s, :pointer to subdevice structure
comedi_insn *insn :pointer to insn structure | comedi_insn *insn :pointer to insn structure |
| unsigned int *data : Data Pointer to read status | | unsigned int *data : Data Pointer to read status |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
...@@ -380,7 +380,7 @@ INT i_APCI2032_ReadDigitalOutput(struct comedi_device * dev, comedi_subdevice * ...@@ -380,7 +380,7 @@ INT i_APCI2032_ReadDigitalOutput(struct comedi_device * dev, comedi_subdevice *
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI2032_ConfigWatchdog(struct comedi_device * dev, comedi_subdevice * s, INT i_APCI2032_ConfigWatchdog(struct comedi_device * dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
if (data[0] == 0) { if (data[0] == 0) {
...@@ -403,13 +403,13 @@ INT i_APCI2032_ConfigWatchdog(struct comedi_device * dev, comedi_subdevice * s, ...@@ -403,13 +403,13 @@ INT i_APCI2032_ConfigWatchdog(struct comedi_device * dev, comedi_subdevice * s,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI2032_StartStopWriteWatchdog | | Function Name : int i_APCI2032_StartStopWriteWatchdog |
| (struct comedi_device *dev,comedi_subdevice *s, | (struct comedi_device *dev,struct comedi_subdevice *s,
comedi_insn *insn,unsigned int *data); | comedi_insn *insn,unsigned int *data); |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Start / Stop The Watchdog | | Task : Start / Stop The Watchdog |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : struct comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| comedi_subdevice *s, :pointer to subdevice structure | struct comedi_subdevice *s, :pointer to subdevice structure
comedi_insn *insn :pointer to insn structure | comedi_insn *insn :pointer to insn structure |
| unsigned int *data : Data Pointer to read status | | unsigned int *data : Data Pointer to read status |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
...@@ -421,7 +421,7 @@ INT i_APCI2032_ConfigWatchdog(struct comedi_device * dev, comedi_subdevice * s, ...@@ -421,7 +421,7 @@ INT i_APCI2032_ConfigWatchdog(struct comedi_device * dev, comedi_subdevice * s,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI2032_StartStopWriteWatchdog(struct comedi_device * dev, comedi_subdevice * s, int i_APCI2032_StartStopWriteWatchdog(struct comedi_device * dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
switch (data[0]) { switch (data[0]) {
...@@ -448,13 +448,13 @@ int i_APCI2032_StartStopWriteWatchdog(struct comedi_device * dev, comedi_subdevi ...@@ -448,13 +448,13 @@ int i_APCI2032_StartStopWriteWatchdog(struct comedi_device * dev, comedi_subdevi
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI2032_ReadWatchdog | | Function Name : int i_APCI2032_ReadWatchdog |
| (struct comedi_device *dev,comedi_subdevice *s,comedi_insn *insn, | (struct comedi_device *dev,struct comedi_subdevice *s,comedi_insn *insn,
unsigned int *data); | unsigned int *data); |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Read The Watchdog | | Task : Read The Watchdog |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : struct comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| comedi_subdevice *s, :pointer to subdevice structure | struct comedi_subdevice *s, :pointer to subdevice structure
comedi_insn *insn :pointer to insn structure | comedi_insn *insn :pointer to insn structure |
| unsigned int *data : Data Pointer to read status | | unsigned int *data : Data Pointer to read status |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
...@@ -466,7 +466,7 @@ int i_APCI2032_StartStopWriteWatchdog(struct comedi_device * dev, comedi_subdevi ...@@ -466,7 +466,7 @@ int i_APCI2032_StartStopWriteWatchdog(struct comedi_device * dev, comedi_subdevi
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI2032_ReadWatchdog(struct comedi_device * dev, comedi_subdevice * s, int i_APCI2032_ReadWatchdog(struct comedi_device * dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
...@@ -530,7 +530,7 @@ void v_APCI2032_Interrupt(int irq, void *d) ...@@ -530,7 +530,7 @@ void v_APCI2032_Interrupt(int irq, void *d)
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI2032_ReadInterruptStatus | | Function Name : int i_APCI2032_ReadInterruptStatus |
| (struct comedi_device *dev,comedi_subdevice *s, | | (struct comedi_device *dev,struct comedi_subdevice *s, |
| comedi_insn *insn,unsigned int *data) | | comedi_insn *insn,unsigned int *data) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task :Reads the interrupt status register | | Task :Reads the interrupt status register |
...@@ -544,7 +544,7 @@ void v_APCI2032_Interrupt(int irq, void *d) ...@@ -544,7 +544,7 @@ void v_APCI2032_Interrupt(int irq, void *d)
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI2032_ReadInterruptStatus(struct comedi_device * dev, comedi_subdevice * s, int i_APCI2032_ReadInterruptStatus(struct comedi_device * dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
*data = ui_Type; *data = ui_Type;
......
drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.h
View file @ 34c43922
...@@ -55,22 +55,22 @@ ...@@ -55,22 +55,22 @@
// Hardware Layer functions for Apci2032 // Hardware Layer functions for Apci2032
//DO //DO
int i_APCI2032_ConfigDigitalOutput(struct comedi_device *dev, comedi_subdevice *s, int i_APCI2032_ConfigDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
INT i_APCI2032_WriteDigitalOutput(struct comedi_device *dev, comedi_subdevice *s, INT i_APCI2032_WriteDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
INT i_APCI2032_ReadDigitalOutput(struct comedi_device *dev, comedi_subdevice *s, INT i_APCI2032_ReadDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
int i_APCI2032_ReadInterruptStatus(struct comedi_device *dev, comedi_subdevice *s, int i_APCI2032_ReadInterruptStatus(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
// TIMER // TIMER
// timer value is passed as u seconds // timer value is passed as u seconds
INT i_APCI2032_ConfigWatchdog(struct comedi_device *dev, comedi_subdevice *s, INT i_APCI2032_ConfigWatchdog(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
int i_APCI2032_StartStopWriteWatchdog(struct comedi_device *dev, comedi_subdevice *s, int i_APCI2032_StartStopWriteWatchdog(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
int i_APCI2032_ReadWatchdog(struct comedi_device *dev, comedi_subdevice *s, int i_APCI2032_ReadWatchdog(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
// Interrupt functions..... // Interrupt functions.....
......
drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.h
View file @ 34c43922
...@@ -36,25 +36,25 @@ ...@@ -36,25 +36,25 @@
// Hardware Layer functions for Apci2200 // Hardware Layer functions for Apci2200
//Digital Input //Digital Input
INT i_APCI2200_ReadMoreDigitalInput(struct comedi_device *dev, comedi_subdevice *s, INT i_APCI2200_ReadMoreDigitalInput(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
INT i_APCI2200_Read1DigitalInput(struct comedi_device *dev, comedi_subdevice *s, INT i_APCI2200_Read1DigitalInput(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
//Digital Output //Digital Output
int i_APCI2200_ConfigDigitalOutput(struct comedi_device *dev, comedi_subdevice *s, int i_APCI2200_ConfigDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
INT i_APCI2200_WriteDigitalOutput(struct comedi_device *dev, comedi_subdevice *s, INT i_APCI2200_WriteDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
INT i_APCI2200_ReadDigitalOutput(struct comedi_device *dev, comedi_subdevice *s, INT i_APCI2200_ReadDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
// TIMER // TIMER
int i_APCI2200_ConfigWatchdog(struct comedi_device *dev, comedi_subdevice *s, int i_APCI2200_ConfigWatchdog(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
int i_APCI2200_StartStopWriteWatchdog(struct comedi_device *dev, comedi_subdevice *s, int i_APCI2200_StartStopWriteWatchdog(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
int i_APCI2200_ReadWatchdog(struct comedi_device *dev, comedi_subdevice *s, int i_APCI2200_ReadWatchdog(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
//reset //reset
......
drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.h
View file @ 34c43922
...@@ -178,19 +178,19 @@ typedef struct { ...@@ -178,19 +178,19 @@ typedef struct {
// Function Declaration For APCI-3120 // Function Declaration For APCI-3120
// Internal functions // Internal functions
int i_APCI3120_SetupChannelList(struct comedi_device *dev, comedi_subdevice *s, int i_APCI3120_SetupChannelList(struct comedi_device *dev, struct comedi_subdevice *s,
int n_chan, unsigned int *chanlist, char check); int n_chan, unsigned int *chanlist, char check);
int i_APCI3120_ExttrigEnable(struct comedi_device *dev); int i_APCI3120_ExttrigEnable(struct comedi_device *dev);
int i_APCI3120_ExttrigDisable(struct comedi_device *dev); int i_APCI3120_ExttrigDisable(struct comedi_device *dev);
int i_APCI3120_StopCyclicAcquisition(struct comedi_device *dev, comedi_subdevice *s); int i_APCI3120_StopCyclicAcquisition(struct comedi_device *dev, struct comedi_subdevice *s);
int i_APCI3120_Reset(struct comedi_device *dev); int i_APCI3120_Reset(struct comedi_device *dev);
int i_APCI3120_CyclicAnalogInput(int mode, struct comedi_device *dev, int i_APCI3120_CyclicAnalogInput(int mode, struct comedi_device *dev,
comedi_subdevice *s); struct comedi_subdevice *s);
// Interrupt functions // Interrupt functions
void v_APCI3120_Interrupt(int irq, void *d); void v_APCI3120_Interrupt(int irq, void *d);
//UPDATE-0.7.57->0.7.68 void v_APCI3120_InterruptDmaMoveBlock16bit(struct comedi_device *dev,comedi_subdevice *s,short *dma,short *data,int n); //UPDATE-0.7.57->0.7.68 void v_APCI3120_InterruptDmaMoveBlock16bit(struct comedi_device *dev,struct comedi_subdevice *s,short *dma,short *data,int n);
void v_APCI3120_InterruptDmaMoveBlock16bit(struct comedi_device *dev, void v_APCI3120_InterruptDmaMoveBlock16bit(struct comedi_device *dev,
comedi_subdevice *s, struct comedi_subdevice *s,
short *dma_buffer, short *dma_buffer,
unsigned int num_samples); unsigned int num_samples);
int i_APCI3120_InterruptHandleEos(struct comedi_device *dev); int i_APCI3120_InterruptHandleEos(struct comedi_device *dev);
...@@ -198,44 +198,44 @@ void v_APCI3120_InterruptDma(int irq, void *d); ...@@ -198,44 +198,44 @@ void v_APCI3120_InterruptDma(int irq, void *d);
// TIMER // TIMER
int i_APCI3120_InsnConfigTimer(struct comedi_device *dev, comedi_subdevice *s, int i_APCI3120_InsnConfigTimer(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
int i_APCI3120_InsnWriteTimer(struct comedi_device *dev, comedi_subdevice *s, int i_APCI3120_InsnWriteTimer(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
int i_APCI3120_InsnReadTimer(struct comedi_device *dev, comedi_subdevice *s, int i_APCI3120_InsnReadTimer(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
//DI //DI
// for di read // for di read
int i_APCI3120_InsnBitsDigitalInput(struct comedi_device *dev, comedi_subdevice *s, int i_APCI3120_InsnBitsDigitalInput(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
int i_APCI3120_InsnReadDigitalInput(struct comedi_device *dev, comedi_subdevice *s, int i_APCI3120_InsnReadDigitalInput(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
//DO //DO
//int i_APCI3120_WriteDigitalOutput(struct comedi_device *dev, BYTE data); //int i_APCI3120_WriteDigitalOutput(struct comedi_device *dev, BYTE data);
int i_APCI3120_InsnConfigDigitalOutput(struct comedi_device *dev, int i_APCI3120_InsnConfigDigitalOutput(struct comedi_device *dev,
comedi_subdevice *s, comedi_insn *insn, struct comedi_subdevice *s, comedi_insn *insn,
unsigned int *data); unsigned int *data);
int i_APCI3120_InsnBitsDigitalOutput(struct comedi_device *dev, comedi_subdevice *s, int i_APCI3120_InsnBitsDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
int i_APCI3120_InsnWriteDigitalOutput(struct comedi_device *dev, comedi_subdevice *s, int i_APCI3120_InsnWriteDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
//AO //AO
//int i_APCI3120_Write1AnalogValue(struct comedi_device *dev,UINT ui_Range,UINT ui_Channel,UINT data ); //int i_APCI3120_Write1AnalogValue(struct comedi_device *dev,UINT ui_Range,UINT ui_Channel,UINT data );
int i_APCI3120_InsnWriteAnalogOutput(struct comedi_device *dev, comedi_subdevice *s, int i_APCI3120_InsnWriteAnalogOutput(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
//AI HArdware layer //AI HArdware layer
int i_APCI3120_InsnConfigAnalogInput(struct comedi_device *dev, comedi_subdevice *s, int i_APCI3120_InsnConfigAnalogInput(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
int i_APCI3120_InsnReadAnalogInput(struct comedi_device *dev, comedi_subdevice *s, int i_APCI3120_InsnReadAnalogInput(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
int i_APCI3120_CommandTestAnalogInput(struct comedi_device *dev, comedi_subdevice *s, int i_APCI3120_CommandTestAnalogInput(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_cmd *cmd); comedi_cmd *cmd);
int i_APCI3120_CommandAnalogInput(struct comedi_device *dev, comedi_subdevice *s); int i_APCI3120_CommandAnalogInput(struct comedi_device *dev, struct comedi_subdevice *s);
//int i_APCI3120_CancelAnalogInput(struct comedi_device *dev, comedi_subdevice *s); //int i_APCI3120_CancelAnalogInput(struct comedi_device *dev, struct comedi_subdevice *s);
int i_APCI3120_StopCyclicAcquisition(struct comedi_device *dev, comedi_subdevice *s); int i_APCI3120_StopCyclicAcquisition(struct comedi_device *dev, struct comedi_subdevice *s);
drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.h
View file @ 34c43922
...@@ -154,22 +154,22 @@ typedef struct { ...@@ -154,22 +154,22 @@ typedef struct {
//AI //AI
INT i_APCI3200_ConfigAnalogInput(struct comedi_device *dev, comedi_subdevice *s, INT i_APCI3200_ConfigAnalogInput(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
INT i_APCI3200_ReadAnalogInput(struct comedi_device *dev, comedi_subdevice *s, INT i_APCI3200_ReadAnalogInput(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
INT i_APCI3200_InsnWriteReleaseAnalogInput(struct comedi_device *dev, INT i_APCI3200_InsnWriteReleaseAnalogInput(struct comedi_device *dev,
comedi_subdevice *s, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
INT i_APCI3200_InsnBits_AnalogInput_Test(struct comedi_device *dev, INT i_APCI3200_InsnBits_AnalogInput_Test(struct comedi_device *dev,
comedi_subdevice *s, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
INT i_APCI3200_StopCyclicAcquisition(struct comedi_device *dev, comedi_subdevice *s); INT i_APCI3200_StopCyclicAcquisition(struct comedi_device *dev, struct comedi_subdevice *s);
INT i_APCI3200_InterruptHandleEos(struct comedi_device *dev); INT i_APCI3200_InterruptHandleEos(struct comedi_device *dev);
INT i_APCI3200_CommandTestAnalogInput(struct comedi_device *dev, comedi_subdevice *s, INT i_APCI3200_CommandTestAnalogInput(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_cmd *cmd); comedi_cmd *cmd);
INT i_APCI3200_CommandAnalogInput(struct comedi_device *dev, comedi_subdevice *s); INT i_APCI3200_CommandAnalogInput(struct comedi_device *dev, struct comedi_subdevice *s);
INT i_APCI3200_ReadDigitalInput(struct comedi_device *dev, comedi_subdevice *s, INT i_APCI3200_ReadDigitalInput(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
//Interrupt //Interrupt
void v_APCI3200_Interrupt(int irq, void *d); void v_APCI3200_Interrupt(int irq, void *d);
...@@ -182,6 +182,6 @@ int i_APCI3200_ReadCJCValue(struct comedi_device *dev, unsigned int *data); ...@@ -182,6 +182,6 @@ int i_APCI3200_ReadCJCValue(struct comedi_device *dev, unsigned int *data);
int i_APCI3200_ReadCalibrationGainValue(struct comedi_device *dev, UINT *data); int i_APCI3200_ReadCalibrationGainValue(struct comedi_device *dev, UINT *data);
int i_APCI3200_ReadCalibrationOffsetValue(struct comedi_device *dev, UINT *data); int i_APCI3200_ReadCalibrationOffsetValue(struct comedi_device *dev, UINT *data);
int i_APCI3200_Read1AnalogInputChannel(struct comedi_device *dev, int i_APCI3200_Read1AnalogInputChannel(struct comedi_device *dev,
comedi_subdevice *s, comedi_insn *insn, struct comedi_subdevice *s, comedi_insn *insn,
unsigned int *data); unsigned int *data);
int i_APCI3200_ReadCJCCalGain(struct comedi_device *dev, unsigned int *data); int i_APCI3200_ReadCJCCalGain(struct comedi_device *dev, unsigned int *data);
drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.h
View file @ 34c43922
...@@ -55,37 +55,37 @@ comedi_lrange range_apci3501_ao = { 2, { ...@@ -55,37 +55,37 @@ comedi_lrange range_apci3501_ao = { 2, {
// Hardware Layer functions for Apci3501 // Hardware Layer functions for Apci3501
//AO //AO
INT i_APCI3501_ConfigAnalogOutput(struct comedi_device *dev, comedi_subdevice *s, INT i_APCI3501_ConfigAnalogOutput(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
INT i_APCI3501_WriteAnalogOutput(struct comedi_device *dev, comedi_subdevice *s, INT i_APCI3501_WriteAnalogOutput(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
//DI //DI
// for di read // for di read
//INT i_APCI3501_ReadDigitalInput(struct comedi_device *dev,comedi_subdevice *s,comedi_insn *insn,unsigned int *data); //INT i_APCI3501_ReadDigitalInput(struct comedi_device *dev,struct comedi_subdevice *s,comedi_insn *insn,unsigned int *data);
INT i_APCI3501_ReadDigitalInput(struct comedi_device *dev, comedi_subdevice *s, INT i_APCI3501_ReadDigitalInput(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
//DO //DO
int i_APCI3501_ConfigDigitalOutput(struct comedi_device *dev, comedi_subdevice *s, int i_APCI3501_ConfigDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
INT i_APCI3501_WriteDigitalOutput(struct comedi_device *dev, comedi_subdevice *s, INT i_APCI3501_WriteDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
INT i_APCI3501_ReadDigitalOutput(struct comedi_device *dev, comedi_subdevice *s, INT i_APCI3501_ReadDigitalOutput(struct comedi_device *dev, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
// TIMER // TIMER
// timer value is passed as u seconds // timer value is passed as u seconds
INT i_APCI3501_ConfigTimerCounterWatchdog(struct comedi_device *dev, INT i_APCI3501_ConfigTimerCounterWatchdog(struct comedi_device *dev,
comedi_subdevice *s, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
int i_APCI3501_StartStopWriteTimerCounterWatchdog(struct comedi_device *dev, int i_APCI3501_StartStopWriteTimerCounterWatchdog(struct comedi_device *dev,
comedi_subdevice *s, struct comedi_subdevice *s,
comedi_insn *insn, comedi_insn *insn,
unsigned int *data); unsigned int *data);
int i_APCI3501_ReadTimerCounterWatchdog(struct comedi_device *dev, int i_APCI3501_ReadTimerCounterWatchdog(struct comedi_device *dev,
comedi_subdevice *s, struct comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
//Interrupt //Interrupt
void v_APCI3501_Interrupt(int irq, void *d); void v_APCI3501_Interrupt(int irq, void *d);
......
drivers/staging/comedi/drivers/adl_pci6208.c
View file @ 34c43922
...@@ -127,13 +127,13 @@ pci6208_pci_setup(struct pci_dev *pci_dev, unsigned long *io_base_ptr, ...@@ -127,13 +127,13 @@ pci6208_pci_setup(struct pci_dev *pci_dev, unsigned long *io_base_ptr,
int dev_minor); int dev_minor);
/*read/write functions*/ /*read/write functions*/
static int pci6208_ao_winsn(struct comedi_device * dev, comedi_subdevice * s, static int pci6208_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int pci6208_ao_rinsn(struct comedi_device * dev, comedi_subdevice * s, static int pci6208_ao_rinsn(struct comedi_device * dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
//static int pci6208_dio_insn_bits(struct comedi_device *dev,comedi_subdevice *s, //static int pci6208_dio_insn_bits(struct comedi_device *dev,struct comedi_subdevice *s,
// comedi_insn *insn,unsigned int *data); // comedi_insn *insn,unsigned int *data);
//static int pci6208_dio_insn_config(struct comedi_device *dev,comedi_subdevice *s, //static int pci6208_dio_insn_config(struct comedi_device *dev,struct comedi_subdevice *s,
// comedi_insn *insn,unsigned int *data); // comedi_insn *insn,unsigned int *data);
/* /*
...@@ -144,7 +144,7 @@ static int pci6208_ao_rinsn(struct comedi_device * dev, comedi_subdevice * s, ...@@ -144,7 +144,7 @@ static int pci6208_ao_rinsn(struct comedi_device * dev, comedi_subdevice * s,
*/ */
static int pci6208_attach(struct comedi_device * dev, comedi_devconfig * it) static int pci6208_attach(struct comedi_device * dev, comedi_devconfig * it)
{ {
comedi_subdevice *s; struct comedi_subdevice *s;
int retval; int retval;
unsigned long io_base; unsigned long io_base;
...@@ -219,7 +219,7 @@ static int pci6208_detach(struct comedi_device * dev) ...@@ -219,7 +219,7 @@ static int pci6208_detach(struct comedi_device * dev)
return 0; return 0;
} }
static int pci6208_ao_winsn(struct comedi_device * dev, comedi_subdevice * s, static int pci6208_ao_winsn(struct comedi_device * dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
int i = 0, Data_Read; int i = 0, Data_Read;
...@@ -244,7 +244,7 @@ static int pci6208_ao_winsn(struct comedi_device * dev, comedi_subdevice * s, ...@@ -244,7 +244,7 @@ static int pci6208_ao_winsn(struct comedi_device * dev, comedi_subdevice * s,
/* AO subdevices should have a read insn as well as a write insn. /* AO subdevices should have a read insn as well as a write insn.
* Usually this means copying a value stored in devpriv. */ * Usually this means copying a value stored in devpriv. */
static int pci6208_ao_rinsn(struct comedi_device * dev, comedi_subdevice * s, static int pci6208_ao_rinsn(struct comedi_device * dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
int i; int i;
...@@ -261,7 +261,7 @@ static int pci6208_ao_rinsn(struct comedi_device * dev, comedi_subdevice * s, ...@@ -261,7 +261,7 @@ static int pci6208_ao_rinsn(struct comedi_device * dev, comedi_subdevice * s,
* useful to applications if you implement the insn_bits interface. * useful to applications if you implement the insn_bits interface.
* This allows packed reading/writing of the DIO channels. The * This allows packed reading/writing of the DIO channels. The
* comedi core can convert between insn_bits and insn_read/write */ * comedi core can convert between insn_bits and insn_read/write */
//static int pci6208_dio_insn_bits(struct comedi_device *dev,comedi_subdevice *s, //static int pci6208_dio_insn_bits(struct comedi_device *dev,struct comedi_subdevice *s,
// comedi_insn *insn,unsigned int *data) // comedi_insn *insn,unsigned int *data)
//{ //{
// if(insn->n!=2)return -EINVAL; // if(insn->n!=2)return -EINVAL;
...@@ -285,7 +285,7 @@ static int pci6208_ao_rinsn(struct comedi_device * dev, comedi_subdevice * s, ...@@ -285,7 +285,7 @@ static int pci6208_ao_rinsn(struct comedi_device * dev, comedi_subdevice * s,
// return 2; // return 2;
//} //}
//static int pci6208_dio_insn_config(struct comedi_device *dev,comedi_subdevice *s, //static int pci6208_dio_insn_config(struct comedi_device *dev,struct comedi_subdevice *s,
// comedi_insn *insn,unsigned int *data) // comedi_insn *insn,unsigned int *data)
//{ //{
// int chan=CR_CHAN(insn->chanspec); // int chan=CR_CHAN(insn->chanspec);
......
drivers/staging/comedi/drivers/adl_pci7296.c
View file @ 34c43922
...@@ -75,7 +75,7 @@ static comedi_driver driver_adl_pci7296 = { ...@@ -75,7 +75,7 @@ static comedi_driver driver_adl_pci7296 = {
static int adl_pci7296_attach(struct comedi_device * dev, comedi_devconfig * it) static int adl_pci7296_attach(struct comedi_device * dev, comedi_devconfig * it)
{ {
struct pci_dev *pcidev; struct pci_dev *pcidev;
comedi_subdevice *s; struct comedi_subdevice *s;
int bus, slot; int bus, slot;
int ret; int ret;
......
drivers/staging/comedi/drivers/adl_pci7432.c
View file @ 34c43922
...@@ -69,10 +69,10 @@ static comedi_driver driver_adl_pci7432 = { ...@@ -69,10 +69,10 @@ static comedi_driver driver_adl_pci7432 = {
/* Digital IO */ /* Digital IO */
static int adl_pci7432_di_insn_bits(struct comedi_device * dev, comedi_subdevice * s, static int adl_pci7432_di_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int adl_pci7432_do_insn_bits(struct comedi_device * dev, comedi_subdevice * s, static int adl_pci7432_do_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
/* */ /* */
...@@ -80,7 +80,7 @@ static int adl_pci7432_do_insn_bits(struct comedi_device * dev, comedi_subdevice ...@@ -80,7 +80,7 @@ static int adl_pci7432_do_insn_bits(struct comedi_device * dev, comedi_subdevice
static int adl_pci7432_attach(struct comedi_device * dev, comedi_devconfig * it) static int adl_pci7432_attach(struct comedi_device * dev, comedi_devconfig * it)
{ {
struct pci_dev *pcidev; struct pci_dev *pcidev;
comedi_subdevice *s; struct comedi_subdevice *s;
int bus, slot; int bus, slot;
printk("comedi: attempt to attach...\n"); printk("comedi: attempt to attach...\n");
...@@ -164,7 +164,7 @@ static int adl_pci7432_detach(struct comedi_device * dev) ...@@ -164,7 +164,7 @@ static int adl_pci7432_detach(struct comedi_device * dev)
return 0; return 0;
} }
static int adl_pci7432_do_insn_bits(struct comedi_device * dev, comedi_subdevice * s, static int adl_pci7432_do_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
printk("comedi: pci7432_do_insn_bits called\n"); printk("comedi: pci7432_do_insn_bits called\n");
...@@ -184,7 +184,7 @@ static int adl_pci7432_do_insn_bits(struct comedi_device * dev, comedi_subdevice ...@@ -184,7 +184,7 @@ static int adl_pci7432_do_insn_bits(struct comedi_device * dev, comedi_subdevice
return 2; return 2;
} }
static int adl_pci7432_di_insn_bits(struct comedi_device * dev, comedi_subdevice * s, static int adl_pci7432_di_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
printk("comedi: pci7432_di_insn_bits called\n"); printk("comedi: pci7432_di_insn_bits called\n");
......
drivers/staging/comedi/drivers/adl_pci8164.c
View file @ 34c43922
...@@ -79,34 +79,34 @@ static comedi_driver driver_adl_pci8164 = { ...@@ -79,34 +79,34 @@ static comedi_driver driver_adl_pci8164 = {
detach:adl_pci8164_detach, detach:adl_pci8164_detach,
}; };
static int adl_pci8164_insn_read_msts(struct comedi_device * dev, comedi_subdevice * s, static int adl_pci8164_insn_read_msts(struct comedi_device * dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int adl_pci8164_insn_read_ssts(struct comedi_device * dev, comedi_subdevice * s, static int adl_pci8164_insn_read_ssts(struct comedi_device * dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int adl_pci8164_insn_read_buf0(struct comedi_device * dev, comedi_subdevice * s, static int adl_pci8164_insn_read_buf0(struct comedi_device * dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int adl_pci8164_insn_read_buf1(struct comedi_device * dev, comedi_subdevice * s, static int adl_pci8164_insn_read_buf1(struct comedi_device * dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int adl_pci8164_insn_write_cmd(struct comedi_device * dev, comedi_subdevice * s, static int adl_pci8164_insn_write_cmd(struct comedi_device * dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int adl_pci8164_insn_write_otp(struct comedi_device * dev, comedi_subdevice * s, static int adl_pci8164_insn_write_otp(struct comedi_device * dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int adl_pci8164_insn_write_buf0(struct comedi_device * dev, static int adl_pci8164_insn_write_buf0(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data); struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data);
static int adl_pci8164_insn_write_buf1(struct comedi_device * dev, static int adl_pci8164_insn_write_buf1(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data); struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data);
static int adl_pci8164_attach(struct comedi_device * dev, comedi_devconfig * it) static int adl_pci8164_attach(struct comedi_device * dev, comedi_devconfig * it)
{ {
struct pci_dev *pcidev; struct pci_dev *pcidev;
comedi_subdevice *s; struct comedi_subdevice *s;
int bus, slot; int bus, slot;
printk("comedi: attempt to attach...\n"); printk("comedi: attempt to attach...\n");
...@@ -208,7 +208,7 @@ static int adl_pci8164_detach(struct comedi_device * dev) ...@@ -208,7 +208,7 @@ static int adl_pci8164_detach(struct comedi_device * dev)
return 0; return 0;
} }
static int adl_pci8164_insn_read_msts(struct comedi_device * dev, comedi_subdevice * s, static int adl_pci8164_insn_read_msts(struct comedi_device * dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
int axis, axis_reg; int axis, axis_reg;
...@@ -245,7 +245,7 @@ static int adl_pci8164_insn_read_msts(struct comedi_device * dev, comedi_subdevi ...@@ -245,7 +245,7 @@ static int adl_pci8164_insn_read_msts(struct comedi_device * dev, comedi_subdevi
return 2; return 2;
} }
static int adl_pci8164_insn_read_ssts(struct comedi_device * dev, comedi_subdevice * s, static int adl_pci8164_insn_read_ssts(struct comedi_device * dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
int axis, axis_reg; int axis, axis_reg;
...@@ -282,7 +282,7 @@ static int adl_pci8164_insn_read_ssts(struct comedi_device * dev, comedi_subdevi ...@@ -282,7 +282,7 @@ static int adl_pci8164_insn_read_ssts(struct comedi_device * dev, comedi_subdevi
return 2; return 2;
} }
static int adl_pci8164_insn_read_buf0(struct comedi_device * dev, comedi_subdevice * s, static int adl_pci8164_insn_read_buf0(struct comedi_device * dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
int axis, axis_reg; int axis, axis_reg;
...@@ -319,7 +319,7 @@ static int adl_pci8164_insn_read_buf0(struct comedi_device * dev, comedi_subdevi ...@@ -319,7 +319,7 @@ static int adl_pci8164_insn_read_buf0(struct comedi_device * dev, comedi_subdevi
return 2; return 2;
} }
static int adl_pci8164_insn_read_buf1(struct comedi_device * dev, comedi_subdevice * s, static int adl_pci8164_insn_read_buf1(struct comedi_device * dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
int axis, axis_reg; int axis, axis_reg;
...@@ -357,7 +357,7 @@ static int adl_pci8164_insn_read_buf1(struct comedi_device * dev, comedi_subdevi ...@@ -357,7 +357,7 @@ static int adl_pci8164_insn_read_buf1(struct comedi_device * dev, comedi_subdevi
return 2; return 2;
} }
static int adl_pci8164_insn_write_cmd(struct comedi_device * dev, comedi_subdevice * s, static int adl_pci8164_insn_write_cmd(struct comedi_device * dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
unsigned int axis, axis_reg; unsigned int axis, axis_reg;
...@@ -395,7 +395,7 @@ static int adl_pci8164_insn_write_cmd(struct comedi_device * dev, comedi_subdevi ...@@ -395,7 +395,7 @@ static int adl_pci8164_insn_write_cmd(struct comedi_device * dev, comedi_subdevi
return 2; return 2;
} }
static int adl_pci8164_insn_write_otp(struct comedi_device * dev, comedi_subdevice * s, static int adl_pci8164_insn_write_otp(struct comedi_device * dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
int axis, axis_reg; int axis, axis_reg;
...@@ -434,7 +434,7 @@ static int adl_pci8164_insn_write_otp(struct comedi_device * dev, comedi_subdevi ...@@ -434,7 +434,7 @@ static int adl_pci8164_insn_write_otp(struct comedi_device * dev, comedi_subdevi
} }
static int adl_pci8164_insn_write_buf0(struct comedi_device * dev, static int adl_pci8164_insn_write_buf0(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
int axis, axis_reg; int axis, axis_reg;
...@@ -472,7 +472,7 @@ static int adl_pci8164_insn_write_buf0(struct comedi_device * dev, ...@@ -472,7 +472,7 @@ static int adl_pci8164_insn_write_buf0(struct comedi_device * dev,
} }
static int adl_pci8164_insn_write_buf1(struct comedi_device * dev, static int adl_pci8164_insn_write_buf1(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
int axis, axis_reg; int axis, axis_reg;
......
drivers/staging/comedi/drivers/adl_pci9111.c
View file @ 34c43922
...@@ -267,7 +267,7 @@ Configuration options: ...@@ -267,7 +267,7 @@ Configuration options:
static int pci9111_attach(struct comedi_device * dev, comedi_devconfig * it); static int pci9111_attach(struct comedi_device * dev, comedi_devconfig * it);
static int pci9111_detach(struct comedi_device * dev); static int pci9111_detach(struct comedi_device * dev);
static void pci9111_ai_munge(struct comedi_device * dev, comedi_subdevice * s, static void pci9111_ai_munge(struct comedi_device * dev, struct comedi_subdevice * s,
void *data, unsigned int num_bytes, unsigned int start_chan_index); void *data, unsigned int num_bytes, unsigned int start_chan_index);
static const comedi_lrange pci9111_hr_ai_range = { static const comedi_lrange pci9111_hr_ai_range = {
...@@ -527,7 +527,7 @@ static void pci9111_interrupt_source_set(struct comedi_device * dev, ...@@ -527,7 +527,7 @@ static void pci9111_interrupt_source_set(struct comedi_device * dev,
#undef AI_DO_CMD_DEBUG #undef AI_DO_CMD_DEBUG
static int pci9111_ai_cancel(struct comedi_device * dev, comedi_subdevice * s) static int pci9111_ai_cancel(struct comedi_device * dev, struct comedi_subdevice * s)
{ {
// Disable interrupts // Disable interrupts
...@@ -558,7 +558,7 @@ static int pci9111_ai_cancel(struct comedi_device * dev, comedi_subdevice * s) ...@@ -558,7 +558,7 @@ static int pci9111_ai_cancel(struct comedi_device * dev, comedi_subdevice * s)
static int static int
pci9111_ai_do_cmd_test(struct comedi_device * dev, pci9111_ai_do_cmd_test(struct comedi_device * dev,
comedi_subdevice * s, comedi_cmd * cmd) struct comedi_subdevice * s, comedi_cmd * cmd)
{ {
int tmp; int tmp;
int error = 0; int error = 0;
...@@ -758,7 +758,7 @@ pci9111_ai_do_cmd_test(struct comedi_device * dev, ...@@ -758,7 +758,7 @@ pci9111_ai_do_cmd_test(struct comedi_device * dev,
// Analog input command // Analog input command
// //
static int pci9111_ai_do_cmd(struct comedi_device * dev, comedi_subdevice * subdevice) static int pci9111_ai_do_cmd(struct comedi_device * dev, struct comedi_subdevice * subdevice)
{ {
comedi_cmd *async_cmd = &subdevice->async->cmd; comedi_cmd *async_cmd = &subdevice->async->cmd;
...@@ -881,7 +881,7 @@ static int pci9111_ai_do_cmd(struct comedi_device * dev, comedi_subdevice * subd ...@@ -881,7 +881,7 @@ static int pci9111_ai_do_cmd(struct comedi_device * dev, comedi_subdevice * subd
return 0; return 0;
} }
static void pci9111_ai_munge(struct comedi_device * dev, comedi_subdevice * s, static void pci9111_ai_munge(struct comedi_device * dev, struct comedi_subdevice * s,
void *data, unsigned int num_bytes, unsigned int start_chan_index) void *data, unsigned int num_bytes, unsigned int start_chan_index)
{ {
unsigned int i, num_samples = num_bytes / sizeof(short); unsigned int i, num_samples = num_bytes / sizeof(short);
...@@ -912,7 +912,7 @@ static void pci9111_ai_munge(struct comedi_device * dev, comedi_subdevice * s, ...@@ -912,7 +912,7 @@ static void pci9111_ai_munge(struct comedi_device * dev, comedi_subdevice * s,
static irqreturn_t pci9111_interrupt(int irq, void *p_device PT_REGS_ARG) static irqreturn_t pci9111_interrupt(int irq, void *p_device PT_REGS_ARG)
{ {
struct comedi_device *dev = p_device; struct comedi_device *dev = p_device;
comedi_subdevice *subdevice = dev->read_subdev; struct comedi_subdevice *subdevice = dev->read_subdev;
comedi_async *async; comedi_async *async;
unsigned long irq_flags; unsigned long irq_flags;
unsigned char intcsr; unsigned char intcsr;
...@@ -1072,7 +1072,7 @@ static irqreturn_t pci9111_interrupt(int irq, void *p_device PT_REGS_ARG) ...@@ -1072,7 +1072,7 @@ static irqreturn_t pci9111_interrupt(int irq, void *p_device PT_REGS_ARG)
#undef AI_INSN_DEBUG #undef AI_INSN_DEBUG
static int pci9111_ai_insn_read(struct comedi_device * dev, static int pci9111_ai_insn_read(struct comedi_device * dev,
comedi_subdevice * subdevice, comedi_insn * insn, unsigned int * data) struct comedi_subdevice * subdevice, comedi_insn * insn, unsigned int * data)
{ {
int resolution = int resolution =
((pci9111_board_struct *) dev->board_ptr)->ai_resolution; ((pci9111_board_struct *) dev->board_ptr)->ai_resolution;
...@@ -1132,7 +1132,7 @@ static int pci9111_ai_insn_read(struct comedi_device * dev, ...@@ -1132,7 +1132,7 @@ static int pci9111_ai_insn_read(struct comedi_device * dev,
static int static int
pci9111_ao_insn_write(struct comedi_device * dev, pci9111_ao_insn_write(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
int i; int i;
...@@ -1149,7 +1149,7 @@ pci9111_ao_insn_write(struct comedi_device * dev, ...@@ -1149,7 +1149,7 @@ pci9111_ao_insn_write(struct comedi_device * dev,
// //
static int pci9111_ao_insn_read(struct comedi_device * dev, static int pci9111_ao_insn_read(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
int i; int i;
...@@ -1171,7 +1171,7 @@ static int pci9111_ao_insn_read(struct comedi_device * dev, ...@@ -1171,7 +1171,7 @@ static int pci9111_ao_insn_read(struct comedi_device * dev,
// //
static int pci9111_di_insn_bits(struct comedi_device * dev, static int pci9111_di_insn_bits(struct comedi_device * dev,
comedi_subdevice * subdevice, comedi_insn * insn, unsigned int * data) struct comedi_subdevice * subdevice, comedi_insn * insn, unsigned int * data)
{ {
unsigned int bits; unsigned int bits;
...@@ -1186,7 +1186,7 @@ static int pci9111_di_insn_bits(struct comedi_device * dev, ...@@ -1186,7 +1186,7 @@ static int pci9111_di_insn_bits(struct comedi_device * dev,
// //
static int pci9111_do_insn_bits(struct comedi_device * dev, static int pci9111_do_insn_bits(struct comedi_device * dev,
comedi_subdevice * subdevice, comedi_insn * insn, unsigned int * data) struct comedi_subdevice * subdevice, comedi_insn * insn, unsigned int * data)
{ {
unsigned int bits; unsigned int bits;
...@@ -1248,7 +1248,7 @@ static int pci9111_reset(struct comedi_device * dev) ...@@ -1248,7 +1248,7 @@ static int pci9111_reset(struct comedi_device * dev)
static int pci9111_attach(struct comedi_device * dev, comedi_devconfig * it) static int pci9111_attach(struct comedi_device * dev, comedi_devconfig * it)
{ {
comedi_subdevice *subdevice; struct comedi_subdevice *subdevice;
unsigned long io_base, io_range, lcr_io_base, lcr_io_range; unsigned long io_base, io_range, lcr_io_base, lcr_io_range;
struct pci_dev *pci_device; struct pci_dev *pci_device;
int error, i; int error, i;
......
drivers/staging/comedi/drivers/adq12b.c
View file @ 34c43922
...@@ -174,9 +174,9 @@ static comedi_driver driver_adq12b={ ...@@ -174,9 +174,9 @@ static comedi_driver driver_adq12b={
num_names: sizeof(adq12b_boards) / sizeof(adq12b_board), num_names: sizeof(adq12b_boards) / sizeof(adq12b_board),
}; };
static int adq12b_ai_rinsn(struct comedi_device *dev,comedi_subdevice *s,comedi_insn *insn,unsigned int *data); static int adq12b_ai_rinsn(struct comedi_device *dev,struct comedi_subdevice *s,comedi_insn *insn,unsigned int *data);
static int adq12b_di_insn_bits(struct comedi_device *dev,comedi_subdevice *s, comedi_insn *insn,unsigned int *data); static int adq12b_di_insn_bits(struct comedi_device *dev,struct comedi_subdevice *s, comedi_insn *insn,unsigned int *data);
static int adq12b_do_insn_bits(struct comedi_device *dev,comedi_subdevice *s, comedi_insn *insn,unsigned int *data); static int adq12b_do_insn_bits(struct comedi_device *dev,struct comedi_subdevice *s, comedi_insn *insn,unsigned int *data);
/* /*
* Attach is called by the Comedi core to configure the driver * Attach is called by the Comedi core to configure the driver
...@@ -186,7 +186,7 @@ static int adq12b_do_insn_bits(struct comedi_device *dev,comedi_subdevice *s, co ...@@ -186,7 +186,7 @@ static int adq12b_do_insn_bits(struct comedi_device *dev,comedi_subdevice *s, co
*/ */
static int adq12b_attach(struct comedi_device *dev,comedi_devconfig *it) static int adq12b_attach(struct comedi_device *dev,comedi_devconfig *it)
{ {
comedi_subdevice *s; struct comedi_subdevice *s;
unsigned long iobase; unsigned long iobase;
int unipolar, differential; int unipolar, differential;
...@@ -314,7 +314,7 @@ static int adq12b_detach(struct comedi_device *dev) ...@@ -314,7 +314,7 @@ static int adq12b_detach(struct comedi_device *dev)
* mode. * mode.
*/ */
static int adq12b_ai_rinsn(struct comedi_device *dev,comedi_subdevice *s,comedi_insn *insn,unsigned int *data) static int adq12b_ai_rinsn(struct comedi_device *dev,struct comedi_subdevice *s,comedi_insn *insn,unsigned int *data)
{ {
int n, i; int n, i;
int range, channel; int range, channel;
...@@ -357,7 +357,7 @@ static int adq12b_ai_rinsn(struct comedi_device *dev,comedi_subdevice *s,comedi_ ...@@ -357,7 +357,7 @@ static int adq12b_ai_rinsn(struct comedi_device *dev,comedi_subdevice *s,comedi_
} }
static int adq12b_di_insn_bits(struct comedi_device *dev,comedi_subdevice *s, comedi_insn *insn,unsigned int *data) static int adq12b_di_insn_bits(struct comedi_device *dev,struct comedi_subdevice *s, comedi_insn *insn,unsigned int *data)
{ {
/* only bits 0-4 have information about digital inputs */ /* only bits 0-4 have information about digital inputs */
...@@ -367,7 +367,7 @@ static int adq12b_di_insn_bits(struct comedi_device *dev,comedi_subdevice *s, c ...@@ -367,7 +367,7 @@ static int adq12b_di_insn_bits(struct comedi_device *dev,comedi_subdevice *s, c
} }
static int adq12b_do_insn_bits(struct comedi_device *dev,comedi_subdevice *s, comedi_insn *insn,unsigned int *data) static int adq12b_do_insn_bits(struct comedi_device *dev,struct comedi_subdevice *s, comedi_insn *insn,unsigned int *data)
{ {
int channel; int channel;
......
drivers/staging/comedi/drivers/adv_pci1710.c
View file @ 34c43922
...@@ -304,14 +304,14 @@ typedef struct { ...@@ -304,14 +304,14 @@ typedef struct {
============================================================================== ==============================================================================
*/ */
static int check_channel_list(struct comedi_device * dev, comedi_subdevice * s, static int check_channel_list(struct comedi_device * dev, struct comedi_subdevice * s,
unsigned int *chanlist, unsigned int n_chan); unsigned int *chanlist, unsigned int n_chan);
static void setup_channel_list(struct comedi_device * dev, comedi_subdevice * s, static void setup_channel_list(struct comedi_device * dev, struct comedi_subdevice * s,
unsigned int *chanlist, unsigned int n_chan, unsigned int seglen); unsigned int *chanlist, unsigned int n_chan, unsigned int seglen);
static void start_pacer(struct comedi_device * dev, int mode, unsigned int divisor1, static void start_pacer(struct comedi_device * dev, int mode, unsigned int divisor1,
unsigned int divisor2); unsigned int divisor2);
static int pci1710_reset(struct comedi_device * dev); static int pci1710_reset(struct comedi_device * dev);
static int pci171x_ai_cancel(struct comedi_device * dev, comedi_subdevice * s); static int pci171x_ai_cancel(struct comedi_device * dev, struct comedi_subdevice * s);
static const unsigned int muxonechan[] = { 0x0000, 0x0101, 0x0202, 0x0303, 0x0404, 0x0505, 0x0606, 0x0707, // used for gain list programming static const unsigned int muxonechan[] = { 0x0000, 0x0101, 0x0202, 0x0303, 0x0404, 0x0505, 0x0606, 0x0707, // used for gain list programming
0x0808, 0x0909, 0x0a0a, 0x0b0b, 0x0c0c, 0x0d0d, 0x0e0e, 0x0f0f, 0x0808, 0x0909, 0x0a0a, 0x0b0b, 0x0c0c, 0x0d0d, 0x0e0e, 0x0f0f,
...@@ -322,7 +322,7 @@ static const unsigned int muxonechan[] = { 0x0000, 0x0101, 0x0202, 0x0303, 0x040 ...@@ -322,7 +322,7 @@ static const unsigned int muxonechan[] = { 0x0000, 0x0101, 0x0202, 0x0303, 0x040
/* /*
============================================================================== ==============================================================================
*/ */
static int pci171x_insn_read_ai(struct comedi_device * dev, comedi_subdevice * s, static int pci171x_insn_read_ai(struct comedi_device * dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
int n, timeout; int n, timeout;
...@@ -390,7 +390,7 @@ static int pci171x_insn_read_ai(struct comedi_device * dev, comedi_subdevice * s ...@@ -390,7 +390,7 @@ static int pci171x_insn_read_ai(struct comedi_device * dev, comedi_subdevice * s
/* /*
============================================================================== ==============================================================================
*/ */
static int pci171x_insn_write_ao(struct comedi_device * dev, comedi_subdevice * s, static int pci171x_insn_write_ao(struct comedi_device * dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
int n, chan, range, ofs; int n, chan, range, ofs;
...@@ -421,7 +421,7 @@ static int pci171x_insn_write_ao(struct comedi_device * dev, comedi_subdevice * ...@@ -421,7 +421,7 @@ static int pci171x_insn_write_ao(struct comedi_device * dev, comedi_subdevice *
/* /*
============================================================================== ==============================================================================
*/ */
static int pci171x_insn_read_ao(struct comedi_device * dev, comedi_subdevice * s, static int pci171x_insn_read_ao(struct comedi_device * dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
int n, chan; int n, chan;
...@@ -436,7 +436,7 @@ static int pci171x_insn_read_ao(struct comedi_device * dev, comedi_subdevice * s ...@@ -436,7 +436,7 @@ static int pci171x_insn_read_ao(struct comedi_device * dev, comedi_subdevice * s
/* /*
============================================================================== ==============================================================================
*/ */
static int pci171x_insn_bits_di(struct comedi_device * dev, comedi_subdevice * s, static int pci171x_insn_bits_di(struct comedi_device * dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
data[1] = inw(dev->iobase + PCI171x_DI); data[1] = inw(dev->iobase + PCI171x_DI);
...@@ -447,7 +447,7 @@ static int pci171x_insn_bits_di(struct comedi_device * dev, comedi_subdevice * s ...@@ -447,7 +447,7 @@ static int pci171x_insn_bits_di(struct comedi_device * dev, comedi_subdevice * s
/* /*
============================================================================== ==============================================================================
*/ */
static int pci171x_insn_bits_do(struct comedi_device * dev, comedi_subdevice * s, static int pci171x_insn_bits_do(struct comedi_device * dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
if (data[0]) { if (data[0]) {
...@@ -463,7 +463,7 @@ static int pci171x_insn_bits_do(struct comedi_device * dev, comedi_subdevice * s ...@@ -463,7 +463,7 @@ static int pci171x_insn_bits_do(struct comedi_device * dev, comedi_subdevice * s
/* /*
============================================================================== ==============================================================================
*/ */
static int pci171x_insn_counter_read(struct comedi_device * dev, comedi_subdevice * s, static int pci171x_insn_counter_read(struct comedi_device * dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
unsigned int msb, lsb, ccntrl; unsigned int msb, lsb, ccntrl;
...@@ -485,7 +485,7 @@ static int pci171x_insn_counter_read(struct comedi_device * dev, comedi_subdevic ...@@ -485,7 +485,7 @@ static int pci171x_insn_counter_read(struct comedi_device * dev, comedi_subdevic
/* /*
============================================================================== ==============================================================================
*/ */
static int pci171x_insn_counter_write(struct comedi_device * dev, comedi_subdevice * s, static int pci171x_insn_counter_write(struct comedi_device * dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
uint msb, lsb, ccntrl, status; uint msb, lsb, ccntrl, status;
...@@ -513,7 +513,7 @@ static int pci171x_insn_counter_write(struct comedi_device * dev, comedi_subdevi ...@@ -513,7 +513,7 @@ static int pci171x_insn_counter_write(struct comedi_device * dev, comedi_subdevi
============================================================================== ==============================================================================
*/ */
static int pci171x_insn_counter_config(struct comedi_device * dev, static int pci171x_insn_counter_config(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
#ifdef unused #ifdef unused
/* This doesn't work like a normal Comedi counter config */ /* This doesn't work like a normal Comedi counter config */
...@@ -548,7 +548,7 @@ static int pci171x_insn_counter_config(struct comedi_device * dev, ...@@ -548,7 +548,7 @@ static int pci171x_insn_counter_config(struct comedi_device * dev,
/* /*
============================================================================== ==============================================================================
*/ */
static int pci1720_insn_write_ao(struct comedi_device * dev, comedi_subdevice * s, static int pci1720_insn_write_ao(struct comedi_device * dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
int n, rangereg, chan; int n, rangereg, chan;
...@@ -577,7 +577,7 @@ static int pci1720_insn_write_ao(struct comedi_device * dev, comedi_subdevice * ...@@ -577,7 +577,7 @@ static int pci1720_insn_write_ao(struct comedi_device * dev, comedi_subdevice *
static void interrupt_pci1710_every_sample(void *d) static void interrupt_pci1710_every_sample(void *d)
{ {
struct comedi_device *dev = d; struct comedi_device *dev = d;
comedi_subdevice *s = dev->subdevices + 0; struct comedi_subdevice *s = dev->subdevices + 0;
int m; int m;
#ifdef PCI171x_PARANOIDCHECK #ifdef PCI171x_PARANOIDCHECK
short sampl; short sampl;
...@@ -659,7 +659,7 @@ static void interrupt_pci1710_every_sample(void *d) ...@@ -659,7 +659,7 @@ static void interrupt_pci1710_every_sample(void *d)
/* /*
============================================================================== ==============================================================================
*/ */
static int move_block_from_fifo(struct comedi_device * dev, comedi_subdevice * s, static int move_block_from_fifo(struct comedi_device * dev, struct comedi_subdevice * s,
int n, int turn) int n, int turn)
{ {
int i, j; int i, j;
...@@ -708,7 +708,7 @@ static int move_block_from_fifo(struct comedi_device * dev, comedi_subdevice * s ...@@ -708,7 +708,7 @@ static int move_block_from_fifo(struct comedi_device * dev, comedi_subdevice * s
static void interrupt_pci1710_half_fifo(void *d) static void interrupt_pci1710_half_fifo(void *d)
{ {
struct comedi_device *dev = d; struct comedi_device *dev = d;
comedi_subdevice *s = dev->subdevices + 0; struct comedi_subdevice *s = dev->subdevices + 0;
int m, samplesinbuf; int m, samplesinbuf;
DPRINTK("adv_pci1710 EDBG: BGN: interrupt_pci1710_half_fifo(...)\n"); DPRINTK("adv_pci1710 EDBG: BGN: interrupt_pci1710_half_fifo(...)\n");
...@@ -802,7 +802,7 @@ static irqreturn_t interrupt_service_pci1710(int irq, void *d PT_REGS_ARG) ...@@ -802,7 +802,7 @@ static irqreturn_t interrupt_service_pci1710(int irq, void *d PT_REGS_ARG)
============================================================================== ==============================================================================
*/ */
static int pci171x_ai_docmd_and_mode(int mode, struct comedi_device * dev, static int pci171x_ai_docmd_and_mode(int mode, struct comedi_device * dev,
comedi_subdevice * s) struct comedi_subdevice * s)
{ {
unsigned int divisor1, divisor2; unsigned int divisor1, divisor2;
unsigned int seglen; unsigned int seglen;
...@@ -900,7 +900,7 @@ static void pci171x_cmdtest_out(int e, comedi_cmd * cmd) ...@@ -900,7 +900,7 @@ static void pci171x_cmdtest_out(int e, comedi_cmd * cmd)
/* /*
============================================================================== ==============================================================================
*/ */
static int pci171x_ai_cmdtest(struct comedi_device * dev, comedi_subdevice * s, static int pci171x_ai_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s,
comedi_cmd * cmd) comedi_cmd * cmd)
{ {
int err = 0; int err = 0;
...@@ -1065,7 +1065,7 @@ static int pci171x_ai_cmdtest(struct comedi_device * dev, comedi_subdevice * s, ...@@ -1065,7 +1065,7 @@ static int pci171x_ai_cmdtest(struct comedi_device * dev, comedi_subdevice * s,
/* /*
============================================================================== ==============================================================================
*/ */
static int pci171x_ai_cmd(struct comedi_device * dev, comedi_subdevice * s) static int pci171x_ai_cmd(struct comedi_device * dev, struct comedi_subdevice * s)
{ {
comedi_cmd *cmd = &s->async->cmd; comedi_cmd *cmd = &s->async->cmd;
...@@ -1104,7 +1104,7 @@ static int pci171x_ai_cmd(struct comedi_device * dev, comedi_subdevice * s) ...@@ -1104,7 +1104,7 @@ static int pci171x_ai_cmd(struct comedi_device * dev, comedi_subdevice * s)
If it's ok, then program scan/gain logic. If it's ok, then program scan/gain logic.
This works for all cards. This works for all cards.
*/ */
static int check_channel_list(struct comedi_device * dev, comedi_subdevice * s, static int check_channel_list(struct comedi_device * dev, struct comedi_subdevice * s,
unsigned int *chanlist, unsigned int n_chan) unsigned int *chanlist, unsigned int n_chan)
{ {
unsigned int chansegment[32]; unsigned int chansegment[32];
...@@ -1163,7 +1163,7 @@ static int check_channel_list(struct comedi_device * dev, comedi_subdevice * s, ...@@ -1163,7 +1163,7 @@ static int check_channel_list(struct comedi_device * dev, comedi_subdevice * s,
return seglen; return seglen;
} }
static void setup_channel_list(struct comedi_device * dev, comedi_subdevice * s, static void setup_channel_list(struct comedi_device * dev, struct comedi_subdevice * s,
unsigned int *chanlist, unsigned int n_chan, unsigned int seglen) unsigned int *chanlist, unsigned int n_chan, unsigned int seglen)
{ {
unsigned int i, range, chanprog; unsigned int i, range, chanprog;
...@@ -1220,7 +1220,7 @@ static void start_pacer(struct comedi_device * dev, int mode, unsigned int divis ...@@ -1220,7 +1220,7 @@ static void start_pacer(struct comedi_device * dev, int mode, unsigned int divis
/* /*
============================================================================== ==============================================================================
*/ */
static int pci171x_ai_cancel(struct comedi_device * dev, comedi_subdevice * s) static int pci171x_ai_cancel(struct comedi_device * dev, struct comedi_subdevice * s)
{ {
DPRINTK("adv_pci1710 EDBG: BGN: pci171x_ai_cancel(...)\n"); DPRINTK("adv_pci1710 EDBG: BGN: pci171x_ai_cancel(...)\n");
...@@ -1318,7 +1318,7 @@ static int pci1710_reset(struct comedi_device * dev) ...@@ -1318,7 +1318,7 @@ static int pci1710_reset(struct comedi_device * dev)
*/ */
static int pci1710_attach(struct comedi_device * dev, comedi_devconfig * it) static int pci1710_attach(struct comedi_device * dev, comedi_devconfig * it)
{ {
comedi_subdevice *s; struct comedi_subdevice *s;
int ret, subdev, n_subdevices; int ret, subdev, n_subdevices;
unsigned int irq; unsigned int irq;
unsigned long iobase; unsigned long iobase;
......
drivers/staging/comedi/drivers/adv_pci1723.c
View file @ 34c43922
...@@ -202,7 +202,7 @@ static int pci1723_reset(struct comedi_device * dev) ...@@ -202,7 +202,7 @@ static int pci1723_reset(struct comedi_device * dev)
return 0; return 0;
} }
static int pci1723_insn_read_ao(struct comedi_device * dev, comedi_subdevice * s, static int pci1723_insn_read_ao(struct comedi_device * dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
int n, chan; int n, chan;
...@@ -218,7 +218,7 @@ static int pci1723_insn_read_ao(struct comedi_device * dev, comedi_subdevice * s ...@@ -218,7 +218,7 @@ static int pci1723_insn_read_ao(struct comedi_device * dev, comedi_subdevice * s
/* /*
analog data output; analog data output;
*/ */
static int pci1723_ao_write_winsn(struct comedi_device * dev, comedi_subdevice * s, static int pci1723_ao_write_winsn(struct comedi_device * dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
int n, chan; int n, chan;
...@@ -238,7 +238,7 @@ static int pci1723_ao_write_winsn(struct comedi_device * dev, comedi_subdevice * ...@@ -238,7 +238,7 @@ static int pci1723_ao_write_winsn(struct comedi_device * dev, comedi_subdevice *
/* /*
digital i/o config/query digital i/o config/query
*/ */
static int pci1723_dio_insn_config(struct comedi_device * dev, comedi_subdevice * s, static int pci1723_dio_insn_config(struct comedi_device * dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
unsigned int mask; unsigned int mask;
...@@ -278,7 +278,7 @@ static int pci1723_dio_insn_config(struct comedi_device * dev, comedi_subdevice ...@@ -278,7 +278,7 @@ static int pci1723_dio_insn_config(struct comedi_device * dev, comedi_subdevice
/* /*
digital i/o bits read/write digital i/o bits read/write
*/ */
static int pci1723_dio_insn_bits(struct comedi_device * dev, comedi_subdevice * s, static int pci1723_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
if (data[0]) { if (data[0]) {
...@@ -296,7 +296,7 @@ static int pci1723_dio_insn_bits(struct comedi_device * dev, comedi_subdevice * ...@@ -296,7 +296,7 @@ static int pci1723_dio_insn_bits(struct comedi_device * dev, comedi_subdevice *
*/ */
static int pci1723_attach(struct comedi_device * dev, comedi_devconfig * it) static int pci1723_attach(struct comedi_device * dev, comedi_devconfig * it)
{ {
comedi_subdevice *s; struct comedi_subdevice *s;
int ret, subdev, n_subdevices; int ret, subdev, n_subdevices;
struct pci_dev *pcidev; struct pci_dev *pcidev;
unsigned int iobase; unsigned int iobase;
......
drivers/staging/comedi/drivers/aio_aio12_8.c
View file @ 34c43922
...@@ -88,7 +88,7 @@ typedef struct { ...@@ -88,7 +88,7 @@ typedef struct {
#define devpriv ((aio12_8_private *) dev->private) #define devpriv ((aio12_8_private *) dev->private)
static int aio_aio12_8_ai_read(struct comedi_device * dev, comedi_subdevice * s, static int aio_aio12_8_ai_read(struct comedi_device * dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
int n; int n;
...@@ -122,7 +122,7 @@ static int aio_aio12_8_ai_read(struct comedi_device * dev, comedi_subdevice * s, ...@@ -122,7 +122,7 @@ static int aio_aio12_8_ai_read(struct comedi_device * dev, comedi_subdevice * s,
return n; return n;
} }
static int aio_aio12_8_ao_read(struct comedi_device * dev, comedi_subdevice * s, static int aio_aio12_8_ao_read(struct comedi_device * dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
int i; int i;
...@@ -133,7 +133,7 @@ static int aio_aio12_8_ao_read(struct comedi_device * dev, comedi_subdevice * s, ...@@ -133,7 +133,7 @@ static int aio_aio12_8_ao_read(struct comedi_device * dev, comedi_subdevice * s,
return insn->n; return insn->n;
} }
static int aio_aio12_8_ao_write(struct comedi_device * dev, comedi_subdevice * s, static int aio_aio12_8_ao_write(struct comedi_device * dev, struct comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
int i; int i;
...@@ -164,7 +164,7 @@ static const comedi_lrange range_aio_aio12_8 = { ...@@ -164,7 +164,7 @@ static const comedi_lrange range_aio_aio12_8 = {
static int aio_aio12_8_attach(struct comedi_device * dev, comedi_devconfig * it) static int aio_aio12_8_attach(struct comedi_device * dev, comedi_devconfig * it)
{ {
int iobase; int iobase;
comedi_subdevice *s; struct comedi_subdevice *s;
iobase = it->options[0]; iobase = it->options[0];
if (!request_region(iobase, 24, "aio_aio12_8")) { if (!request_region(iobase, 24, "aio_aio12_8")) {
......
drivers/staging/comedi/drivers/c6xdigio.c
View file @ 34c43922
This diff is collapsed.
drivers/staging/comedi/drivers/cb_pcidas.c
View file @ 34c43922
This diff is collapsed.
drivers/staging/comedi/drivers/cb_pcidda.c
View file @ 34c43922
This diff is collapsed.
drivers/staging/comedi/drivers/cb_pcimdas.c
View file @ 34c43922
This diff is collapsed.
drivers/staging/comedi/drivers/cb_pcimdda.c
View file @ 34c43922
This diff is collapsed.
drivers/staging/comedi/drivers/comedi_fc.c
View file @ 34c43922
This diff is collapsed.
drivers/staging/comedi/drivers/comedi_fc.h
View file @ 34c43922
This diff is collapsed.
drivers/staging/comedi/drivers/das08.c
View file @ 34c43922
This diff is collapsed.
drivers/staging/comedi/drivers/das16.c
View file @ 34c43922
This diff is collapsed.
drivers/staging/comedi/drivers/das16m1.c
View file @ 34c43922
This diff is collapsed.
drivers/staging/comedi/drivers/das1800.c
View file @ 34c43922
This diff is collapsed.
drivers/staging/comedi/drivers/das6402.c
View file @ 34c43922
This diff is collapsed.
drivers/staging/comedi/drivers/das800.c
View file @ 34c43922
This diff is collapsed.
drivers/staging/comedi/drivers/dmm32at.c
View file @ 34c43922
This diff is collapsed.
drivers/staging/comedi/drivers/dt2801.c
View file @ 34c43922
This diff is collapsed.
drivers/staging/comedi/drivers/dt2811.c
View file @ 34c43922
This diff is collapsed.
drivers/staging/comedi/drivers/dt2814.c
View file @ 34c43922
This diff is collapsed.
drivers/staging/comedi/drivers/dt2815.c
View file @ 34c43922
This diff is collapsed.
drivers/staging/comedi/drivers/dt2817.c
View file @ 34c43922
This diff is collapsed.
drivers/staging/comedi/drivers/dt282x.c
View file @ 34c43922
This diff is collapsed.
drivers/staging/comedi/drivers/dt3000.c
View file @ 34c43922
This diff is collapsed.
drivers/staging/comedi/drivers/dt9812.c
View file @ 34c43922
This diff is collapsed.
drivers/staging/comedi/drivers/fl512.c
View file @ 34c43922
This diff is collapsed.
drivers/staging/comedi/drivers/gsc_hpdi.c
View file @ 34c43922
This diff is collapsed.
drivers/staging/comedi/drivers/icp_multi.c
View file @ 34c43922
This diff is collapsed.
drivers/staging/comedi/drivers/ii_pci20kc.c
View file @ 34c43922
This diff is collapsed.
drivers/staging/comedi/drivers/jr3_pci.c
View file @ 34c43922
This diff is collapsed.
drivers/staging/comedi/drivers/ke_counter.c
View file @ 34c43922
This diff is collapsed.
drivers/staging/comedi/drivers/me4000.c
View file @ 34c43922
This diff is collapsed.
drivers/staging/comedi/drivers/me_daq.c
View file @ 34c43922
This diff is collapsed.
drivers/staging/comedi/drivers/mpc624.c
View file @ 34c43922
This diff is collapsed.
drivers/staging/comedi/drivers/mpc8260cpm.c
View file @ 34c43922
This diff is collapsed.
drivers/staging/comedi/drivers/multiq3.c
View file @ 34c43922
This diff is collapsed.
drivers/staging/comedi/drivers/ni_6527.c
View file @ 34c43922
This diff is collapsed.
drivers/staging/comedi/drivers/ni_65xx.c
View file @ 34c43922
This diff is collapsed.
drivers/staging/comedi/drivers/ni_660x.c
View file @ 34c43922
This diff is collapsed.
drivers/staging/comedi/drivers/ni_670x.c
View file @ 34c43922
This diff is collapsed.
drivers/staging/comedi/drivers/ni_at_ao.c
View file @ 34c43922
This diff is collapsed.
drivers/staging/comedi/drivers/ni_daq_700.c
View file @ 34c43922
This diff is collapsed.
drivers/staging/comedi/drivers/ni_labpc.c
View file @ 34c43922
This diff is collapsed.
drivers/staging/comedi/drivers/ni_pcidio.c
View file @ 34c43922
This diff is collapsed.
drivers/staging/comedi/drivers/ni_pcimio.c
View file @ 34c43922
This diff is collapsed.
drivers/staging/comedi/drivers/ni_tio.h
View file @ 34c43922
This diff is collapsed.
drivers/staging/comedi/drivers/ni_tiocmd.c
View file @ 34c43922
This diff is collapsed.
drivers/staging/comedi/drivers/pcl711.c
View file @ 34c43922
This diff is collapsed.
drivers/staging/comedi/drivers/pcl725.c
View file @ 34c43922
This diff is collapsed.
drivers/staging/comedi/drivers/pcl726.c
View file @ 34c43922
This diff is collapsed.
drivers/staging/comedi/drivers/pcl730.c
View file @ 34c43922
This diff is collapsed.
drivers/staging/comedi/drivers/pcl812.c
View file @ 34c43922
This diff is collapsed.
drivers/staging/comedi/drivers/pcl816.c
View file @ 34c43922
This diff is collapsed.
drivers/staging/comedi/drivers/pcl818.c
View file @ 34c43922
This diff is collapsed.
drivers/staging/comedi/drivers/pcm3724.c
View file @ 34c43922
This diff is collapsed.
drivers/staging/comedi/drivers/pcm3730.c
View file @ 34c43922
This diff is collapsed.
drivers/staging/comedi/drivers/pcmad.c
View file @ 34c43922
This diff is collapsed.
drivers/staging/comedi/drivers/pcmda12.c
View file @ 34c43922
This diff is collapsed.
drivers/staging/comedi/drivers/pcmmio.c
View file @ 34c43922
This diff is collapsed.
drivers/staging/comedi/drivers/pcmuio.c
View file @ 34c43922
This diff is collapsed.
drivers/staging/comedi/drivers/poc.c
View file @ 34c43922
This diff is collapsed.
drivers/staging/comedi/drivers/rtd520.c
View file @ 34c43922
This diff is collapsed.
drivers/staging/comedi/drivers/rti800.c
View file @ 34c43922
This diff is collapsed.
drivers/staging/comedi/drivers/rti802.c
View file @ 34c43922
This diff is collapsed.
drivers/staging/comedi/drivers/s526.c
View file @ 34c43922
This diff is collapsed.
drivers/staging/comedi/drivers/s626.c
View file @ 34c43922
This diff is collapsed.
drivers/staging/comedi/drivers/serial2002.c
View file @ 34c43922
This diff is collapsed.
drivers/staging/comedi/drivers/skel.c
View file @ 34c43922
This diff is collapsed.
drivers/staging/comedi/drivers/ssv_dnp.c
View file @ 34c43922
This diff is collapsed.
drivers/staging/comedi/drivers/unioxx5.c
View file @ 34c43922
This diff is collapsed.
drivers/staging/comedi/drivers/usbdux.c
View file @ 34c43922
This diff is collapsed.
drivers/staging/comedi/drivers/usbduxfast.c
View file @ 34c43922
This diff is collapsed.
drivers/staging/comedi/kcomedilib/get.c
View file @ 34c43922
This diff is collapsed.
drivers/staging/comedi/range.c
View file @ 34c43922
This diff is collapsed.
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7