hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Staging: comedi: Remove comedi_device typedef 

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Bill Pemberton 2009-03-16 22:05:08 -04:00 committed by Greg Kroah-Hartman
parent 790c55415a
commit 71b5f4f119
168 changed files with 3186 additions and 3187 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,29 +69,29 @@ static DEFINE_SPINLOCK(comedi_file_info_table_lock);
static struct comedi_device_file_info static struct comedi_device_file_info
*comedi_file_info_table[COMEDI_NUM_MINORS]; *comedi_file_info_table[COMEDI_NUM_MINORS];
static int do_devconfig_ioctl(comedi_device *dev, comedi_devconfig *arg); static int do_devconfig_ioctl(struct comedi_device *dev, comedi_devconfig *arg);
static int do_bufconfig_ioctl(comedi_device *dev, void *arg); static int do_bufconfig_ioctl(struct comedi_device *dev, void *arg);
static int do_devinfo_ioctl(comedi_device *dev, comedi_devinfo *arg, static int do_devinfo_ioctl(struct comedi_device *dev, comedi_devinfo *arg,
struct file *file); struct file *file);
static int do_subdinfo_ioctl(comedi_device *dev, comedi_subdinfo *arg, static int do_subdinfo_ioctl(struct comedi_device *dev, comedi_subdinfo *arg,
void *file); void *file);
static int do_chaninfo_ioctl(comedi_device *dev, comedi_chaninfo *arg); static int do_chaninfo_ioctl(struct comedi_device *dev, comedi_chaninfo *arg);
static int do_bufinfo_ioctl(comedi_device *dev, void *arg); static int do_bufinfo_ioctl(struct comedi_device *dev, void *arg);
static int do_cmd_ioctl(comedi_device *dev, void *arg, void *file); static int do_cmd_ioctl(struct comedi_device *dev, void *arg, void *file);
static int do_lock_ioctl(comedi_device *dev, unsigned int arg, void *file); static int do_lock_ioctl(struct comedi_device *dev, unsigned int arg, void *file);
static int do_unlock_ioctl(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_cancel_ioctl(comedi_device *dev, unsigned int arg, void *file); static int do_cancel_ioctl(struct comedi_device *dev, unsigned int arg, void *file);
static int do_cmdtest_ioctl(comedi_device *dev, void *arg, void *file); static int do_cmdtest_ioctl(struct comedi_device *dev, void *arg, void *file);
static int do_insnlist_ioctl(comedi_device *dev, void *arg, void *file); static int do_insnlist_ioctl(struct comedi_device *dev, void *arg, void *file);
static int do_insn_ioctl(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(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(comedi_device *dev, comedi_subdevice *s); extern void do_become_nonbusy(struct comedi_device *dev, comedi_subdevice *s);
static int do_cancel(comedi_device *dev, comedi_subdevice *s); static int do_cancel(struct comedi_device *dev, 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);
static int is_device_busy(comedi_device *dev); static int is_device_busy(struct comedi_device *dev);
#ifdef HAVE_UNLOCKED_IOCTL #ifdef HAVE_UNLOCKED_IOCTL
static long comedi_unlocked_ioctl(struct file *file, unsigned int cmd, static long comedi_unlocked_ioctl(struct file *file, unsigned int cmd,
@ -104,7 +104,7 @@ static int comedi_ioctl(struct inode *inode, struct file *file,
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_device *dev; struct comedi_device *dev;
int rc; int rc;
if (dev_file_info == NULL || dev_file_info->device == NULL) if (dev_file_info == NULL || dev_file_info->device == NULL)
@ -192,7 +192,7 @@ done:
writes: writes:
none none
*/ */
static int do_devconfig_ioctl(comedi_device *dev, comedi_devconfig *arg) static int do_devconfig_ioctl(struct comedi_device *dev, comedi_devconfig *arg)
{ {
comedi_devconfig it; comedi_devconfig it;
int ret; int ret;
@ -272,7 +272,7 @@ static int do_devconfig_ioctl(comedi_device *dev, comedi_devconfig *arg)
modified bufconfig at arg modified bufconfig at arg
*/ */
static int do_bufconfig_ioctl(comedi_device *dev, void *arg) static int do_bufconfig_ioctl(struct comedi_device *dev, void *arg)
{ {
comedi_bufconfig bc; comedi_bufconfig bc;
comedi_async *async; comedi_async *async;
@ -360,7 +360,7 @@ copyback:
devinfo structure devinfo structure
*/ */
static int do_devinfo_ioctl(comedi_device *dev, comedi_devinfo *arg, static int do_devinfo_ioctl(struct comedi_device *dev, comedi_devinfo *arg,
struct file *file) struct file *file)
{ {
comedi_devinfo devinfo; comedi_devinfo devinfo;
@ -410,7 +410,7 @@ static int do_devinfo_ioctl(comedi_device *dev, comedi_devinfo *arg,
array of subdevice info structures at arg array of subdevice info structures at arg
*/ */
static int do_subdinfo_ioctl(comedi_device *dev, comedi_subdinfo *arg, static int do_subdinfo_ioctl(struct comedi_device *dev, comedi_subdinfo *arg,
void *file) void *file)
{ {
int ret, i; int ret, i;
@ -490,7 +490,7 @@ static int do_subdinfo_ioctl(comedi_device *dev, comedi_subdinfo *arg,
arrays at elements of chaninfo structure arrays at elements of chaninfo structure
*/ */
static int do_chaninfo_ioctl(comedi_device *dev, comedi_chaninfo *arg) static int do_chaninfo_ioctl(struct comedi_device *dev, comedi_chaninfo *arg)
{ {
comedi_subdevice *s; comedi_subdevice *s;
comedi_chaninfo it; comedi_chaninfo it;
@ -554,7 +554,7 @@ static int do_chaninfo_ioctl(comedi_device *dev, comedi_chaninfo *arg)
modified bufinfo at arg modified bufinfo at arg
*/ */
static int do_bufinfo_ioctl(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; comedi_subdevice *s;
@ -607,7 +607,7 @@ copyback:
return 0; return 0;
} }
static int parse_insn(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_INSNLIST * COMEDI_INSNLIST
@ -626,7 +626,7 @@ static int parse_insn(comedi_device *dev, comedi_insn *insn, unsigned int *data,
*/ */
/* arbitrary limits */ /* arbitrary limits */
#define MAX_SAMPLES 256 #define MAX_SAMPLES 256
static int do_insnlist_ioctl(comedi_device *dev, void *arg, void *file) static int do_insnlist_ioctl(struct comedi_device *dev, void *arg, void *file)
{ {
comedi_insnlist insnlist; comedi_insnlist insnlist;
comedi_insn *insns = NULL; comedi_insn *insns = NULL;
@ -757,7 +757,7 @@ static int check_insn_config_length(comedi_insn *insn, unsigned int *data)
return -EINVAL; return -EINVAL;
} }
static int parse_insn(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; comedi_subdevice *s;
@ -917,7 +917,7 @@ out:
* writes: * writes:
* data (for reads) * data (for reads)
*/ */
static int do_insn_ioctl(comedi_device *dev, void *arg, void *file) static int do_insn_ioctl(struct comedi_device *dev, void *arg, void *file)
{ {
comedi_insn insn; comedi_insn insn;
unsigned int *data = NULL; unsigned int *data = NULL;
@ -975,7 +975,7 @@ error:
modified cmd structure at arg modified cmd structure at arg
*/ */
static int do_cmd_ioctl(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; comedi_subdevice *s;
@ -1129,7 +1129,7 @@ cleanup:
modified cmd structure at arg modified cmd structure at arg
*/ */
static int do_cmdtest_ioctl(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; comedi_subdevice *s;
@ -1227,7 +1227,7 @@ cleanup:
*/ */
static int do_lock_ioctl(comedi_device *dev, unsigned int arg, void *file) 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;
@ -1271,7 +1271,7 @@ static int do_lock_ioctl(comedi_device *dev, unsigned int arg, void *file)
This function isn't protected by the semaphore, since This function isn't protected by the semaphore, since
we already own the lock. we already own the lock.
*/ */
static int do_unlock_ioctl(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; comedi_subdevice *s;
@ -1311,7 +1311,7 @@ static int do_unlock_ioctl(comedi_device *dev, unsigned int arg, void *file)
nothing nothing
*/ */
static int do_cancel_ioctl(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; comedi_subdevice *s;
@ -1347,7 +1347,7 @@ static int do_cancel_ioctl(comedi_device *dev, unsigned int arg, void *file)
nothing nothing
*/ */
static int do_poll_ioctl(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; comedi_subdevice *s;
@ -1370,7 +1370,7 @@ static int do_poll_ioctl(comedi_device *dev, unsigned int arg, void *file)
return -EINVAL; return -EINVAL;
} }
static int do_cancel(comedi_device *dev, comedi_subdevice *s) static int do_cancel(struct comedi_device *dev, comedi_subdevice *s)
{ {
int ret = 0; int ret = 0;
@ -1385,7 +1385,7 @@ static int do_cancel(comedi_device *dev, comedi_subdevice *s)
void comedi_unmap(struct vm_area_struct *area) void comedi_unmap(struct vm_area_struct *area)
{ {
comedi_async *async; comedi_async *async;
comedi_device *dev; struct comedi_device *dev;
async = area->vm_private_data; async = area->vm_private_data;
dev = async->subdevice->device; dev = async->subdevice->device;
@ -1404,7 +1404,7 @@ static int comedi_mmap(struct file *file, struct vm_area_struct *vma)
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_device *dev = dev_file_info->device; struct comedi_device *dev = dev_file_info->device;
comedi_async *async = NULL; comedi_async *async = NULL;
unsigned long start = vma->vm_start; unsigned long start = vma->vm_start;
unsigned long size; unsigned long size;
@ -1480,7 +1480,7 @@ static unsigned int comedi_poll(struct file *file, poll_table *wait)
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_device *dev = dev_file_info->device; struct comedi_device *dev = dev_file_info->device;
comedi_subdevice *read_subdev; comedi_subdevice *read_subdev;
comedi_subdevice *write_subdev; comedi_subdevice *write_subdev;
@ -1530,7 +1530,7 @@ static ssize_t comedi_write(struct file *file, const char *buf, size_t nbytes,
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_device *dev = dev_file_info->device; struct comedi_device *dev = dev_file_info->device;
if (!dev->attached) { if (!dev->attached) {
DPRINTK("no driver configured on comedi%i\n", dev->minor); DPRINTK("no driver configured on comedi%i\n", dev->minor);
@ -1632,7 +1632,7 @@ static ssize_t comedi_read(struct file *file, char *buf, size_t nbytes,
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_device *dev = dev_file_info->device; struct comedi_device *dev = dev_file_info->device;
if (!dev->attached) { if (!dev->attached) {
DPRINTK("no driver configured on comedi%i\n", dev->minor); DPRINTK("no driver configured on comedi%i\n", dev->minor);
@ -1733,7 +1733,7 @@ done:
/* /*
This function restores a subdevice to an idle state. This function restores a subdevice to an idle state.
*/ */
void do_become_nonbusy(comedi_device *dev, comedi_subdevice *s) void do_become_nonbusy(struct comedi_device *dev, comedi_subdevice *s)
{ {
comedi_async *async = s->async; comedi_async *async = s->async;
@ -1760,7 +1760,7 @@ static int comedi_open(struct inode *inode, struct file *file)
const unsigned minor = iminor(inode); const unsigned minor = iminor(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_device *dev = dev_file_info ? dev_file_info->device : NULL; struct comedi_device *dev = dev_file_info ? dev_file_info->device : NULL;
if (dev == NULL) { if (dev == NULL) {
DPRINTK("invalid minor number\n"); DPRINTK("invalid minor number\n");
@ -1832,7 +1832,7 @@ static int comedi_close(struct inode *inode, struct file *file)
const unsigned minor = iminor(inode); const unsigned minor = iminor(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_device *dev = dev_file_info->device; struct comedi_device *dev = dev_file_info->device;
comedi_subdevice *s = NULL; comedi_subdevice *s = NULL;
int i; int i;
@ -1871,7 +1871,7 @@ static int comedi_fasync(int fd, struct file *file, int on)
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_device *dev = dev_file_info->device; struct comedi_device *dev = dev_file_info->device;
return fasync_helper(fd, file, on, &dev->async_queue); return fasync_helper(fd, file, on, &dev->async_queue);
} }
@ -2000,13 +2000,13 @@ static void __exit comedi_cleanup(void)
module_init(comedi_init); module_init(comedi_init);
module_exit(comedi_cleanup); module_exit(comedi_cleanup);
void comedi_error(const comedi_device *dev, const char *s) void comedi_error(const struct comedi_device *dev, const char *s)
{ {
rt_printk("comedi%d: %s: %s\n", dev->minor, dev->driver->driver_name, rt_printk("comedi%d: %s: %s\n", dev->minor, dev->driver->driver_name,
s); s);
} }
void comedi_event(comedi_device *dev, comedi_subdevice *s) void comedi_event(struct comedi_device *dev, comedi_subdevice *s)
{ {
comedi_async *async = s->async; comedi_async *async = s->async;
unsigned runflags = 0; unsigned runflags = 0;
@ -2089,7 +2089,7 @@ unsigned comedi_get_subdevice_runflags(comedi_subdevice *s)
return runflags; return runflags;
} }
static int is_device_busy(comedi_device *dev) static int is_device_busy(struct comedi_device *dev)
{ {
comedi_subdevice *s; comedi_subdevice *s;
int i; int i;
@ -2108,15 +2108,15 @@ static int is_device_busy(comedi_device *dev)
return 0; return 0;
} }
void comedi_device_init(comedi_device *dev) void comedi_device_init(struct comedi_device *dev)
{ {
memset(dev, 0, sizeof(comedi_device)); memset(dev, 0, sizeof(struct comedi_device));
spin_lock_init(&dev->spinlock); spin_lock_init(&dev->spinlock);
mutex_init(&dev->mutex); mutex_init(&dev->mutex);
dev->minor = -1; dev->minor = -1;
} }
void comedi_device_cleanup(comedi_device *dev) void comedi_device_cleanup(struct comedi_device *dev)
{ {
if (dev == NULL) if (dev == NULL)
return; return;
@ -2136,7 +2136,7 @@ int comedi_alloc_board_minor(struct device *hardware_device)
info = kzalloc(sizeof(struct comedi_device_file_info), GFP_KERNEL); info = kzalloc(sizeof(struct comedi_device_file_info), GFP_KERNEL);
if (info == NULL) if (info == NULL)
return -ENOMEM; return -ENOMEM;
info->device = kzalloc(sizeof(comedi_device), GFP_KERNEL); info->device = kzalloc(sizeof(struct comedi_device), GFP_KERNEL);
if (info->device == NULL) { if (info->device == NULL) {
kfree(info); kfree(info);
return -ENOMEM; return -ENOMEM;
@ -2180,7 +2180,7 @@ void comedi_free_board_minor(unsigned minor)
comedi_spin_unlock_irqrestore(&comedi_file_info_table_lock, flags); comedi_spin_unlock_irqrestore(&comedi_file_info_table_lock, flags);
if (info) { if (info) {
comedi_device *dev = info->device; struct comedi_device *dev = info->device;
if (dev) { if (dev) {
if (dev->class_dev) { if (dev->class_dev) {
device_destroy(comedi_class, device_destroy(comedi_class,
@ -2193,7 +2193,7 @@ void comedi_free_board_minor(unsigned minor)
} }
} }
int comedi_alloc_subdevice_minor(comedi_device *dev, comedi_subdevice *s) int comedi_alloc_subdevice_minor(struct comedi_device *dev, comedi_subdevice *s)
{ {
unsigned long flags; unsigned long flags;
struct comedi_device_file_info *info; struct comedi_device_file_info *info;

8
drivers/staging/comedi/comedi_rt.h
View File

@ -58,12 +58,12 @@
int comedi_request_irq(unsigned int irq, irqreturn_t(*handler) (int, int comedi_request_irq(unsigned int irq, irqreturn_t(*handler) (int,
void *PT_REGS_ARG), unsigned long flags, const char *device, void *PT_REGS_ARG), unsigned long flags, const char *device,
comedi_device *dev_id); struct comedi_device *dev_id);
void comedi_free_irq(unsigned int irq, comedi_device *dev_id); void comedi_free_irq(unsigned int irq, struct comedi_device *dev_id);
void comedi_rt_init(void); void comedi_rt_init(void);
void comedi_rt_cleanup(void); void comedi_rt_cleanup(void);
int comedi_switch_to_rt(comedi_device *dev); int comedi_switch_to_rt(struct comedi_device *dev);
void comedi_switch_to_non_rt(comedi_device *dev); void comedi_switch_to_non_rt(struct comedi_device *dev);
void comedi_rt_pend_wakeup(wait_queue_head_t *q); void comedi_rt_pend_wakeup(wait_queue_head_t *q);
extern int rt_pend_call(void (*func) (int arg1, void *arg2), int arg1, extern int rt_pend_call(void (*func) (int arg1, void *arg2), int arg1,
void *arg2); void *arg2);

67
drivers/staging/comedi/comedidev.h
View File

@ -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_device_struct comedi_device;
typedef struct comedi_subdevice_struct comedi_subdevice; 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;
@ -133,7 +132,7 @@ typedef struct device device_create_result_type;
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;
volatile int subdev_flags; volatile int subdev_flags;
@ -163,27 +162,27 @@ struct comedi_subdevice_struct {
unsigned int *chanlist; /* driver-owned chanlist (not used) */ unsigned int *chanlist; /* driver-owned chanlist (not used) */
int (*insn_read) (comedi_device *, comedi_subdevice *, comedi_insn *, int (*insn_read) (struct comedi_device *, comedi_subdevice *, comedi_insn *,
unsigned int *); unsigned int *);
int (*insn_write) (comedi_device *, comedi_subdevice *, comedi_insn *, int (*insn_write) (struct comedi_device *, comedi_subdevice *, comedi_insn *,
unsigned int *); unsigned int *);
int (*insn_bits) (comedi_device *, comedi_subdevice *, comedi_insn *, int (*insn_bits) (struct comedi_device *, comedi_subdevice *, comedi_insn *,
unsigned int *); unsigned int *);
int (*insn_config) (comedi_device *, comedi_subdevice *, comedi_insn *, int (*insn_config) (struct comedi_device *, comedi_subdevice *, comedi_insn *,
unsigned int *); unsigned int *);
int (*do_cmd) (comedi_device *, comedi_subdevice *); int (*do_cmd) (struct comedi_device *, comedi_subdevice *);
int (*do_cmdtest) (comedi_device *, comedi_subdevice *, comedi_cmd *); int (*do_cmdtest) (struct comedi_device *, comedi_subdevice *, comedi_cmd *);
int (*poll) (comedi_device *, comedi_subdevice *); int (*poll) (struct comedi_device *, comedi_subdevice *);
int (*cancel) (comedi_device *, comedi_subdevice *); int (*cancel) (struct comedi_device *, comedi_subdevice *);
/* int (*do_lock)(comedi_device *,comedi_subdevice *); */ /* int (*do_lock)(struct comedi_device *,comedi_subdevice *); */
/* int (*do_unlock)(comedi_device *,comedi_subdevice *); */ /* int (*do_unlock)(struct comedi_device *,comedi_subdevice *); */
/* called when the buffer changes */ /* called when the buffer changes */
int (*buf_change) (comedi_device *dev, comedi_subdevice *s, int (*buf_change) (struct comedi_device *dev, comedi_subdevice *s,
unsigned long new_size); unsigned long new_size);
void (*munge) (comedi_device *dev, comedi_subdevice *s, void *data, void (*munge) (struct comedi_device *dev, 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;
@ -238,7 +237,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) (comedi_device *dev, comedi_subdevice *s, int (*inttrig) (struct comedi_device *dev, comedi_subdevice *s,
unsigned int x); unsigned int x);
}; };
@ -247,8 +246,8 @@ struct comedi_driver_struct {
const char *driver_name; const char *driver_name;
struct module *module; struct module *module;
int (*attach) (comedi_device *, comedi_devconfig *); int (*attach) (struct comedi_device *, comedi_devconfig *);
int (*detach) (comedi_device *); int (*detach) (struct comedi_device *);
/* number of elements in board_name and board_id arrays */ /* number of elements in board_name and board_id arrays */
unsigned int num_names; unsigned int num_names;
@ -257,7 +256,7 @@ struct comedi_driver_struct {
int offset; int offset;
}; };
struct comedi_device_struct { struct comedi_device {
int use_count; int use_count;
comedi_driver *driver; comedi_driver *driver;
void *private; void *private;
@ -289,12 +288,12 @@ struct comedi_device_struct {
struct fasync_struct *async_queue; struct fasync_struct *async_queue;
void (*open) (comedi_device *dev); void (*open) (struct comedi_device *dev);
void (*close) (comedi_device *dev); void (*close) (struct comedi_device *dev);
}; };
struct comedi_device_file_info { struct comedi_device_file_info {
comedi_device *device; struct comedi_device *device;
comedi_subdevice *read_subdevice; comedi_subdevice *read_subdevice;
comedi_subdevice *write_subdevice; comedi_subdevice *write_subdevice;
}; };
@ -309,8 +308,8 @@ static const int comedi_debug;
* function prototypes * function prototypes
*/ */
void comedi_event(comedi_device *dev, comedi_subdevice *s); void comedi_event(struct comedi_device *dev, comedi_subdevice *s);
void comedi_error(const 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
the minor number soon, after more distros support > 8 bit minor numbers the minor number soon, after more distros support > 8 bit minor numbers
@ -344,17 +343,17 @@ static inline comedi_subdevice *comedi_get_write_subdevice(
return info->device->write_subdev; return info->device->write_subdev;
} }
void comedi_device_detach(comedi_device *dev); void comedi_device_detach(struct comedi_device *dev);
int comedi_device_attach(comedi_device *dev, comedi_devconfig *it); int comedi_device_attach(struct comedi_device *dev, comedi_devconfig *it);
int comedi_driver_register(comedi_driver *); int comedi_driver_register(comedi_driver *);
int comedi_driver_unregister(comedi_driver *); int comedi_driver_unregister(comedi_driver *);
void init_polling(void); void init_polling(void);
void cleanup_polling(void); void cleanup_polling(void);
void start_polling(comedi_device *); void start_polling(struct comedi_device *);
void stop_polling(comedi_device *); void stop_polling(struct comedi_device *);
int comedi_buf_alloc(comedi_device *dev, comedi_subdevice *s, unsigned long int comedi_buf_alloc(struct comedi_device *dev, comedi_subdevice *s, unsigned long
new_size); new_size);
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
@ -383,12 +382,12 @@ enum subdevice_runflags {
various internal comedi functions various internal comedi functions
*/ */
int do_rangeinfo_ioctl(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(comedi_subdevice *s, int n, unsigned int *chanlist);
void comedi_set_subdevice_runflags(comedi_subdevice *s, unsigned mask, void comedi_set_subdevice_runflags(comedi_subdevice *s, unsigned mask,
unsigned bits); unsigned bits);
unsigned comedi_get_subdevice_runflags(comedi_subdevice *s); unsigned comedi_get_subdevice_runflags(comedi_subdevice *s);
int insn_inval(comedi_device *dev, comedi_subdevice *s, int insn_inval(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
/* range stuff */ /* range stuff */
@ -422,7 +421,7 @@ struct comedi_lrange_struct {
/* some silly little inline functions */ /* some silly little inline functions */
static inline int alloc_subdevices(comedi_device *dev, static inline int alloc_subdevices(struct comedi_device *dev,
unsigned int num_subdevices) unsigned int num_subdevices)
{ {
unsigned i; unsigned i;
@ -441,7 +440,7 @@ static inline int alloc_subdevices(comedi_device *dev,
return 0; return 0;
} }
static inline int alloc_private(comedi_device *dev, int size) static inline int alloc_private(struct comedi_device *dev, int size)
{ {
dev->private = kzalloc(size, GFP_KERNEL); dev->private = kzalloc(size, GFP_KERNEL);
if (!dev->private) if (!dev->private)
@ -459,7 +458,7 @@ static inline unsigned int bytes_per_sample(const comedi_subdevice *subd)
/* must be used in attach to set dev->hw_dev if you wish to dma directly /* must be used in attach to set dev->hw_dev if you wish to dma directly
into comedi's buffer */ into comedi's buffer */
static inline void comedi_set_hw_dev(comedi_device *dev, struct device *hw_dev) static inline void comedi_set_hw_dev(struct comedi_device *dev, struct device *hw_dev)
{ {
if (dev->hw_dev) if (dev->hw_dev)
put_device(dev->hw_dev); put_device(dev->hw_dev);
@ -524,7 +523,7 @@ 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(comedi_device *dev, comedi_subdevice *s); int comedi_alloc_subdevice_minor(struct comedi_device *dev, comedi_subdevice *s);
void comedi_free_subdevice_minor(comedi_subdevice *s); void comedi_free_subdevice_minor(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);

28
drivers/staging/comedi/drivers.c
View File

@ -47,13 +47,13 @@
#include <asm/io.h> #include <asm/io.h>
#include <asm/system.h> #include <asm/system.h>
static int postconfig(comedi_device *dev); static int postconfig(struct comedi_device *dev);
static int insn_rw_emulate_bits(comedi_device *dev, comedi_subdevice *s, static int insn_rw_emulate_bits(struct comedi_device *dev, 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(comedi_device *dev, comedi_subdevice *s); static int poll_invalid(struct comedi_device *dev, comedi_subdevice *s);
int comedi_buf_alloc(comedi_device *dev, comedi_subdevice *s, int comedi_buf_alloc(struct comedi_device *dev, comedi_subdevice *s,
unsigned long new_size); unsigned long new_size);
comedi_driver *comedi_drivers; comedi_driver *comedi_drivers;
@ -63,7 +63,7 @@ int comedi_modprobe(int minor)
return -EINVAL; return -EINVAL;
} }
static void cleanup_device(comedi_device *dev) static void cleanup_device(struct comedi_device *dev)
{ {
int i; int i;
comedi_subdevice *s; comedi_subdevice *s;
@ -95,7 +95,7 @@ static void cleanup_device(comedi_device *dev)
comedi_set_hw_dev(dev, NULL); comedi_set_hw_dev(dev, NULL);
} }
static void __comedi_device_detach(comedi_device *dev) static void __comedi_device_detach(struct comedi_device *dev)
{ {
dev->attached = 0; dev->attached = 0;
if (dev->driver) { if (dev->driver) {
@ -106,14 +106,14 @@ static void __comedi_device_detach(comedi_device *dev)
cleanup_device(dev); cleanup_device(dev);
} }
void comedi_device_detach(comedi_device *dev) void comedi_device_detach(struct comedi_device *dev)
{ {
if (!dev->attached) if (!dev->attached)
return; return;
__comedi_device_detach(dev); __comedi_device_detach(dev);
} }
int comedi_device_attach(comedi_device *dev, comedi_devconfig *it) int comedi_device_attach(struct comedi_device *dev, comedi_devconfig *it)
{ {
comedi_driver *driv; comedi_driver *driv;
int ret; int ret;
@ -196,7 +196,7 @@ int comedi_driver_unregister(comedi_driver *driver)
/* check for devices using this driver */ /* check for devices using this driver */
for (i = 0; i < COMEDI_NUM_BOARD_MINORS; i++) { for (i = 0; i < COMEDI_NUM_BOARD_MINORS; i++) {
struct comedi_device_file_info *dev_file_info = comedi_get_device_file_info(i); struct comedi_device_file_info *dev_file_info = comedi_get_device_file_info(i);
comedi_device *dev; struct comedi_device *dev;
if(dev_file_info == NULL) continue; if(dev_file_info == NULL) continue;
dev = dev_file_info->device; dev = dev_file_info->device;
@ -224,7 +224,7 @@ int comedi_driver_unregister(comedi_driver *driver)
return -EINVAL; return -EINVAL;
} }
static int postconfig(comedi_device *dev) static int postconfig(struct comedi_device *dev)
{ {
int i; int i;
comedi_subdevice *s; comedi_subdevice *s;
@ -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(comedi_device *dev, comedi_subdevice *s) static int poll_invalid(struct comedi_device *dev, comedi_subdevice *s)
{ {
return -EINVAL; return -EINVAL;
} }
int insn_inval(comedi_device *dev, comedi_subdevice *s, int insn_inval(struct comedi_device *dev, 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(comedi_device *dev, comedi_subdevice *s, static int insn_rw_emulate_bits(struct comedi_device *dev, 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)
return kva; return kva;
} }
int comedi_buf_alloc(comedi_device *dev, comedi_subdevice *s, int comedi_buf_alloc(struct comedi_device *dev, comedi_subdevice *s,
unsigned long new_size) unsigned long new_size)
{ {
comedi_async *async = s->async; comedi_async *async = s->async;

30
drivers/staging/comedi/drivers/8255.c
View File

@ -105,8 +105,8 @@ struct subdev_8255_struct {
#define CALLBACK_FUNC (((struct subdev_8255_struct *)s->private)->cb_func) #define CALLBACK_FUNC (((struct subdev_8255_struct *)s->private)->cb_func)
#define subdevpriv ((struct subdev_8255_struct *)s->private) #define subdevpriv ((struct subdev_8255_struct *)s->private)
static int dev_8255_attach(comedi_device * dev, comedi_devconfig * it); static int dev_8255_attach(struct comedi_device *dev, comedi_devconfig * it);
static int dev_8255_detach(comedi_device * dev); static int dev_8255_detach(struct comedi_device *dev);
static comedi_driver driver_8255 = { static comedi_driver driver_8255 = {
driver_name:"8255", driver_name:"8255",
module:THIS_MODULE, module:THIS_MODULE,
@ -116,9 +116,9 @@ static comedi_driver driver_8255 = {
COMEDI_INITCLEANUP(driver_8255); COMEDI_INITCLEANUP(driver_8255);
static void do_config(comedi_device * dev, comedi_subdevice * s); static void do_config(struct comedi_device *dev, comedi_subdevice * s);
void subdev_8255_interrupt(comedi_device * dev, comedi_subdevice * s) void subdev_8255_interrupt(struct comedi_device *dev, 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)
} }
} }
static int subdev_8255_insn(comedi_device * dev, comedi_subdevice * s, static int subdev_8255_insn(struct comedi_device *dev, 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(comedi_device * dev, comedi_subdevice * s,
return 2; return 2;
} }
static int subdev_8255_insn_config(comedi_device * dev, comedi_subdevice * s, static int subdev_8255_insn_config(struct comedi_device *dev, 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(comedi_device * dev, comedi_subdevice * s,
return 1; return 1;
} }
static void do_config(comedi_device * dev, comedi_subdevice * s) static void do_config(struct comedi_device *dev, comedi_subdevice * s)
{ {
int config; int config;
@ -222,7 +222,7 @@ static void do_config(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(comedi_device * dev, comedi_subdevice * s, static int subdev_8255_cmdtest(struct comedi_device *dev, comedi_subdevice * s,
comedi_cmd * cmd) comedi_cmd * cmd)
{ {
int err = 0; int err = 0;
@ -297,21 +297,21 @@ static int subdev_8255_cmdtest(comedi_device * dev, comedi_subdevice * s,
return 0; return 0;
} }
static int subdev_8255_cmd(comedi_device * dev, comedi_subdevice * s) static int subdev_8255_cmd(struct comedi_device *dev, comedi_subdevice * s)
{ {
/* FIXME */ /* FIXME */
return 0; return 0;
} }
static int subdev_8255_cancel(comedi_device * dev, comedi_subdevice * s) static int subdev_8255_cancel(struct comedi_device *dev, comedi_subdevice * s)
{ {
/* FIXME */ /* FIXME */
return 0; return 0;
} }
int subdev_8255_init(comedi_device * dev, comedi_subdevice * s, int (*cb) (int, int subdev_8255_init(struct comedi_device *dev, 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(comedi_device * dev, comedi_subdevice * s, int (*cb) (int,
return 0; return 0;
} }
int subdev_8255_init_irq(comedi_device * dev, comedi_subdevice * s, int subdev_8255_init_irq(struct comedi_device *dev, 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(comedi_device * dev, comedi_subdevice * s,
return 0; return 0;
} }
void subdev_8255_cleanup(comedi_device * dev, comedi_subdevice * s) void subdev_8255_cleanup(struct comedi_device *dev, comedi_subdevice * s)
{ {
if (s->private) { if (s->private) {
if (subdevpriv->have_irq) { if (subdevpriv->have_irq) {
@ -374,7 +374,7 @@ void subdev_8255_cleanup(comedi_device * dev, comedi_subdevice * s)
*/ */
static int dev_8255_attach(comedi_device * dev, comedi_devconfig * it) static int dev_8255_attach(struct comedi_device *dev, comedi_devconfig * it)
{ {
int ret; int ret;
unsigned long iobase; unsigned long iobase;
@ -416,7 +416,7 @@ static int dev_8255_attach(comedi_device * dev, comedi_devconfig * it)
return 0; return 0;
} }
static int dev_8255_detach(comedi_device * dev) static int dev_8255_detach(struct comedi_device *dev)
{ {
int i; int i;
unsigned long iobase; unsigned long iobase;

12
drivers/staging/comedi/drivers/8255.h
View File

@ -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(comedi_device * dev, comedi_subdevice * s, int subdev_8255_init(struct comedi_device * dev, 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(comedi_device * dev, comedi_subdevice * s, int subdev_8255_init_irq(struct comedi_device * dev, 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(comedi_device * dev, comedi_subdevice * s); void subdev_8255_cleanup(struct comedi_device * dev, comedi_subdevice * s);
void subdev_8255_interrupt(comedi_device * dev, comedi_subdevice * s); void subdev_8255_interrupt(struct comedi_device * dev, comedi_subdevice * s);
#else #else
static inline int subdev_8255_init(comedi_device * dev, comedi_subdevice * s, static inline int subdev_8255_init(struct comedi_device * dev, 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");
@ -47,7 +47,7 @@ static inline int subdev_8255_init(comedi_device * dev, comedi_subdevice * s,
return 0; return 0;
} }
static inline void subdev_8255_cleanup(comedi_device * dev, static inline void subdev_8255_cleanup(struct comedi_device * dev,
comedi_subdevice * s) comedi_subdevice * s)
{ {
} }

12
drivers/staging/comedi/drivers/acl7225b.c
View File

@ -22,8 +22,8 @@ Devices: [Adlink] ACL-7225b (acl7225b), [ICP] P16R16DIO (p16r16dio)
#define ACL7225_DI_LO 2 /* Digital input low byte (DI0-DI7) */ #define ACL7225_DI_LO 2 /* Digital input low byte (DI0-DI7) */
#define ACL7225_DI_HI 3 /* Digital input high byte (DI8-DI15) */ #define ACL7225_DI_HI 3 /* Digital input high byte (DI8-DI15) */
static int acl7225b_attach(comedi_device * dev, comedi_devconfig * it); static int acl7225b_attach(struct comedi_device *dev, comedi_devconfig * it);
static int acl7225b_detach(comedi_device * dev); static int acl7225b_detach(struct comedi_device *dev);
typedef struct { typedef struct {
const char *name; // driver name const char *name; // driver name
@ -50,7 +50,7 @@ static comedi_driver driver_acl7225b = {
COMEDI_INITCLEANUP(driver_acl7225b); COMEDI_INITCLEANUP(driver_acl7225b);
static int acl7225b_do_insn(comedi_device * dev, comedi_subdevice * s, static int acl7225b_do_insn(struct comedi_device *dev, 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(comedi_device * dev, comedi_subdevice * s,
return 2; return 2;
} }
static int acl7225b_di_insn(comedi_device * dev, comedi_subdevice * s, static int acl7225b_di_insn(struct comedi_device *dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
if (insn->n != 2) if (insn->n != 2)
@ -83,7 +83,7 @@ static int acl7225b_di_insn(comedi_device * dev, comedi_subdevice * s,
return 2; return 2;
} }
static int acl7225b_attach(comedi_device * dev, comedi_devconfig * it) static int acl7225b_attach(struct comedi_device *dev, comedi_devconfig * it)
{ {
comedi_subdevice *s; comedi_subdevice *s;
int iobase, iorange; int iobase, iorange;
@ -138,7 +138,7 @@ static int acl7225b_attach(comedi_device * dev, comedi_devconfig * it)
return 0; return 0;
} }
static int acl7225b_detach(comedi_device * dev) static int acl7225b_detach(struct comedi_device *dev)
{ {
printk("comedi%d: acl7225b: remove\n", dev->minor); printk("comedi%d: acl7225b: remove\n", dev->minor);

24
drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.c
View File

@ -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(comedi_device *dev,comedi_subdevice *s, INT i_InsnConfig_InitTimer(struct comedi_device *dev,comedi_subdevice *s,
comedi_insn *insn,unsigned int *data) comedi_insn *insn,unsigned int *data)
| |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@ -219,7 +219,7 @@ INT i_InsnConfig_InitTimer(comedi_device *dev,comedi_subdevice *s,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_InsnConfigInitTimer(comedi_device * dev, comedi_subdevice * s, INT i_APCI1710_InsnConfigInitTimer(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
@ -406,7 +406,7 @@ INT i_APCI1710_InsnConfigInitTimer(comedi_device * dev, comedi_subdevice * s,
| BYTE_ b_ModulNbr, | | BYTE_ b_ModulNbr, |
| BYTE_ b_TimerNbr, | | BYTE_ b_TimerNbr, |
| BYTE_ b_InterruptEnable) | BYTE_ b_InterruptEnable)
INT i_APCI1710_InsnWriteEnableDisableTimer(comedi_device *dev,comedi_subdevice *s, INT i_APCI1710_InsnWriteEnableDisableTimer(struct comedi_device *dev,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 |
@ -448,7 +448,7 @@ i_ReturnValue=insn->n;
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_InsnWriteEnableDisableTimer(comedi_device * dev, INT i_APCI1710_InsnWriteEnableDisableTimer(struct comedi_device * dev,
comedi_subdevice * s, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
@ -561,7 +561,7 @@ INT i_APCI1710_InsnWriteEnableDisableTimer(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(comedi_device *dev,comedi_subdevice *s, INT i_APCI1710_InsnReadAllTimerValue(struct comedi_device *dev,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(comedi_device *dev,comedi_subdevice *s,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_InsnReadAllTimerValue(comedi_device *dev, comedi_subdevice *s, INT i_APCI1710_InsnReadAllTimerValue(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data) comedi_insn *insn, unsigned int *data)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
@ -668,7 +668,7 @@ INT i_APCI1710_InsnReadAllTimerValue(comedi_device *dev, comedi_subdevice *s,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name :INT i_APCI1710_InsnBitsTimer(comedi_device *dev, | Function Name :INT i_APCI1710_InsnBitsTimer(struct comedi_device *dev,
comedi_subdevice *s,comedi_insn *insn,unsigned int *data) | 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) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_InsnBitsTimer(comedi_device * dev, comedi_subdevice * s, INT i_APCI1710_InsnBitsTimer(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
BYTE b_BitsType; BYTE b_BitsType;
@ -760,7 +760,7 @@ INT i_APCI1710_InsnBitsTimer(comedi_device * dev, comedi_subdevice * s,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_ReadTimerValue(comedi_device * dev, INT i_APCI1710_ReadTimerValue(struct comedi_device * dev,
BYTE b_ModulNbr, BYTE b_TimerNbr, BYTE b_ModulNbr, BYTE b_TimerNbr,
PULONG pul_TimerValue) PULONG pul_TimerValue)
{ {
@ -848,7 +848,7 @@ INT i_APCI1710_ReadTimerValue(comedi_device * dev,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_GetTimerOutputLevel(comedi_device * dev, INT i_APCI1710_GetTimerOutputLevel(struct comedi_device * dev,
BYTE b_ModulNbr, BYTE b_TimerNbr, BYTE b_ModulNbr, BYTE b_TimerNbr,
PBYTE pb_OutputLevel) PBYTE pb_OutputLevel)
{ {
@ -927,7 +927,7 @@ INT i_APCI1710_GetTimerOutputLevel(comedi_device * dev,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_GetTimerProgressStatus(comedi_device *dev, INT i_APCI1710_GetTimerProgressStatus(struct comedi_device *dev,
BYTE b_ModulNbr, BYTE b_TimerNbr, BYTE b_ModulNbr, BYTE b_TimerNbr,
PBYTE pb_TimerStatus) PBYTE pb_TimerStatus)
{ {
@ -1006,7 +1006,7 @@ INT i_APCI1710_GetTimerProgressStatus(comedi_device *dev,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_WriteTimerValue(comedi_device * dev, INT i_APCI1710_WriteTimerValue(struct comedi_device * dev,
BYTE b_ModulNbr, BYTE b_TimerNbr, BYTE b_ModulNbr, BYTE b_TimerNbr,
ULONG ul_WriteValue) ULONG ul_WriteValue)
{ {

16
drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.h
View File

@ -34,40 +34,40 @@
/* /*
* 82X54 TIMER INISIALISATION FUNCTION * 82X54 TIMER INISIALISATION FUNCTION
*/ */
INT i_APCI1710_InsnConfigInitTimer(comedi_device *dev, comedi_subdevice *s, INT i_APCI1710_InsnConfigInitTimer(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
INT i_APCI1710_InsnWriteEnableDisableTimer(comedi_device *dev, INT i_APCI1710_InsnWriteEnableDisableTimer(struct comedi_device *dev,
comedi_subdevice *s, 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(comedi_device *dev, comedi_subdevice *s, INT i_APCI1710_InsnReadAllTimerValue(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
INT i_APCI1710_InsnBitsTimer(comedi_device *dev, comedi_subdevice *s, INT i_APCI1710_InsnBitsTimer(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
/* /*
* 82X54 READ & WRITE FUNCTION * 82X54 READ & WRITE FUNCTION
*/ */
INT i_APCI1710_ReadTimerValue(comedi_device *dev, INT i_APCI1710_ReadTimerValue(struct comedi_device *dev,
BYTE b_ModulNbr, BYTE b_TimerNbr, BYTE b_ModulNbr, BYTE b_TimerNbr,
PULONG pul_TimerValue); PULONG pul_TimerValue);
INT i_APCI1710_GetTimerOutputLevel(comedi_device *dev, INT i_APCI1710_GetTimerOutputLevel(struct comedi_device *dev,
BYTE b_ModulNbr, BYTE b_TimerNbr, BYTE b_ModulNbr, BYTE b_TimerNbr,
PBYTE pb_OutputLevel); PBYTE pb_OutputLevel);
INT i_APCI1710_GetTimerProgressStatus(comedi_device *dev, INT i_APCI1710_GetTimerProgressStatus(struct comedi_device *dev,
BYTE b_ModulNbr, BYTE b_TimerNbr, BYTE b_ModulNbr, BYTE b_TimerNbr,
PBYTE pb_TimerStatus); PBYTE pb_TimerStatus);
/* /*
* 82X54 WRITE FUNCTION * 82X54 WRITE FUNCTION
*/ */
INT i_APCI1710_WriteTimerValue(comedi_device *dev, INT i_APCI1710_WriteTimerValue(struct comedi_device *dev,
BYTE b_ModulNbr, BYTE b_TimerNbr, BYTE b_ModulNbr, BYTE b_TimerNbr,
ULONG ul_WriteValue); ULONG ul_WriteValue);

20
drivers/staging/comedi/drivers/addi-data/APCI1710_Chrono.c
View File

@ -131,7 +131,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_InsnConfigInitChrono(comedi_device * dev, comedi_subdevice * s, INT i_APCI1710_InsnConfigInitChrono(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
@ -790,7 +790,7 @@ INT i_APCI1710_InsnConfigInitChrono(comedi_device * dev, comedi_subdevice * s,
| BYTE_ b_ModulNbr, | | BYTE_ b_ModulNbr, |
| BYTE_ b_CycleMode, | | BYTE_ b_CycleMode, |
| BYTE_ b_InterruptEnable) | BYTE_ b_InterruptEnable)
INT i_APCI1710_InsnWriteEnableDisableChrono(comedi_device *dev, INT i_APCI1710_InsnWriteEnableDisableChrono(struct comedi_device *dev,
comedi_subdevice *s,comedi_insn *insn,unsigned int *data) | comedi_subdevice *s,comedi_insn *insn,unsigned int *data) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Enable the chronometer from selected module | | Task : Enable the chronometer from selected module |
@ -840,7 +840,7 @@ comedi_subdevice *s,comedi_insn *insn,unsigned int *data) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_InsnWriteEnableDisableChrono(comedi_device * dev, INT i_APCI1710_InsnWriteEnableDisableChrono(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
@ -1077,7 +1077,7 @@ INT i_APCI1710_InsnWriteEnableDisableChrono(comedi_device * dev,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name :INT i_APCI1710_InsnReadChrono(comedi_device *dev,comedi_subdevice *s, | Function Name :INT i_APCI1710_InsnReadChrono(struct comedi_device *dev,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) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_InsnReadChrono(comedi_device * dev, comedi_subdevice * s, INT i_APCI1710_InsnReadChrono(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
BYTE b_ReadType; BYTE b_ReadType;
@ -1194,7 +1194,7 @@ INT i_APCI1710_InsnReadChrono(comedi_device * dev, comedi_subdevice * s,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_GetChronoProgressStatus(comedi_device * dev, INT i_APCI1710_GetChronoProgressStatus(struct comedi_device * dev,
BYTE b_ModulNbr, PBYTE pb_ChronoStatus) BYTE b_ModulNbr, PBYTE pb_ChronoStatus)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
@ -1355,7 +1355,7 @@ INT i_APCI1710_GetChronoProgressStatus(comedi_device * dev,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_ReadChronoValue(comedi_device * dev, INT i_APCI1710_ReadChronoValue(struct comedi_device * dev,
BYTE b_ModulNbr, BYTE b_ModulNbr,
UINT ui_TimeOut, PBYTE pb_ChronoStatus, PULONG pul_ChronoValue) UINT ui_TimeOut, PBYTE pb_ChronoStatus, PULONG pul_ChronoValue)
{ {
@ -1619,7 +1619,7 @@ INT i_APCI1710_ReadChronoValue(comedi_device * dev,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_ConvertChronoValue(comedi_device * dev, INT i_APCI1710_ConvertChronoValue(struct comedi_device * dev,
BYTE b_ModulNbr, BYTE b_ModulNbr,
ULONG ul_ChronoValue, ULONG ul_ChronoValue,
PULONG pul_Hour, PULONG pul_Hour,
@ -1757,7 +1757,7 @@ INT i_APCI1710_ConvertChronoValue(comedi_device * dev,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : INT i_APCI1710_InsnBitsChronoDigitalIO(comedi_device *dev,comedi_subdevice *s, | Function Name : INT i_APCI1710_InsnBitsChronoDigitalIO(struct comedi_device *dev,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 |
@ -1876,7 +1876,7 @@ INT i_APCI1710_ConvertChronoValue(comedi_device * dev,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_InsnBitsChronoDigitalIO(comedi_device * dev, INT i_APCI1710_InsnBitsChronoDigitalIO(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;

14
drivers/staging/comedi/drivers/addi-data/APCI1710_Chrono.h
View File

@ -35,10 +35,10 @@
/* /*
* CHRONOMETER INISIALISATION FUNCTION * CHRONOMETER INISIALISATION FUNCTION
*/ */
INT i_APCI1710_InsnConfigInitChrono(comedi_device *dev, comedi_subdevice *s, INT i_APCI1710_InsnConfigInitChrono(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
INT i_APCI1710_InsnWriteEnableDisableChrono(comedi_device *dev, INT i_APCI1710_InsnWriteEnableDisableChrono(struct comedi_device *dev,
comedi_subdevice *s, comedi_subdevice *s,
comedi_insn *insn, comedi_insn *insn,
unsigned int *data); unsigned int *data);
@ -46,18 +46,18 @@ INT i_APCI1710_InsnWriteEnableDisableChrono(comedi_device *dev,
/* /*
* CHRONOMETER READ FUNCTION * CHRONOMETER READ FUNCTION
*/ */
INT i_APCI1710_InsnReadChrono(comedi_device *dev, comedi_subdevice *s, INT i_APCI1710_InsnReadChrono(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
INT i_APCI1710_GetChronoProgressStatus(comedi_device *dev, INT i_APCI1710_GetChronoProgressStatus(struct comedi_device *dev,
BYTE b_ModulNbr, PBYTE pb_ChronoStatus); BYTE b_ModulNbr, PBYTE pb_ChronoStatus);
INT i_APCI1710_ReadChronoValue(comedi_device *dev, INT i_APCI1710_ReadChronoValue(struct comedi_device *dev,
BYTE b_ModulNbr, BYTE b_ModulNbr,
UINT ui_TimeOut, PBYTE pb_ChronoStatus, UINT ui_TimeOut, PBYTE pb_ChronoStatus,
PULONG pul_ChronoValue); PULONG pul_ChronoValue);
INT i_APCI1710_ConvertChronoValue(comedi_device *dev, INT i_APCI1710_ConvertChronoValue(struct comedi_device *dev,
BYTE b_ModulNbr, BYTE b_ModulNbr,
ULONG ul_ChronoValue, ULONG ul_ChronoValue,
PULONG pul_Hour, PULONG pul_Hour,
@ -69,6 +69,6 @@ INT i_APCI1710_ConvertChronoValue(comedi_device *dev,
/* /*
* CHRONOMETER DIGITAL INPUT OUTPUT FUNCTION * CHRONOMETER DIGITAL INPUT OUTPUT FUNCTION
*/ */
INT i_APCI1710_InsnBitsChronoDigitalIO(comedi_device *dev, INT i_APCI1710_InsnBitsChronoDigitalIO(struct comedi_device *dev,
comedi_subdevice *s, comedi_insn *insn, comedi_subdevice *s, comedi_insn *insn,
unsigned int *data); unsigned int *data);

14
drivers/staging/comedi/drivers/addi-data/APCI1710_Dig_io.c
View File

@ -61,7 +61,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : INT i_APCI1710_InsnConfigDigitalIO(comedi_device *dev, | | Function Name : INT i_APCI1710_InsnConfigDigitalIO(struct comedi_device *dev, |
| comedi_subdevice *s,comedi_insn *insn,unsigned int *data)| | 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 |
@ -99,7 +99,7 @@ Activates and deactivates the digital output memory.
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_InsnConfigDigitalIO(comedi_device * dev, comedi_subdevice * s, INT i_APCI1710_InsnConfigDigitalIO(struct comedi_device * dev, 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;
@ -247,7 +247,7 @@ INT i_APCI1710_InsnConfigDigitalIO(comedi_device * dev, comedi_subdevice * s,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
|INT i_APCI1710_InsnReadDigitalIOChlValue(comedi_device *dev,comedi_subdevice |INT i_APCI1710_InsnReadDigitalIOChlValue(struct comedi_device *dev,comedi_subdevice
*s, comedi_insn *insn,unsigned int *data) *s, comedi_insn *insn,unsigned int *data)
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@ -293,7 +293,7 @@ INT i_APCI1710_InsnConfigDigitalIO(comedi_device * dev, comedi_subdevice * s,
// BYTE_ b_InputChannel, // BYTE_ b_InputChannel,
// //
// PBYTE_ pb_ChannelStatus) // PBYTE_ pb_ChannelStatus)
INT i_APCI1710_InsnReadDigitalIOChlValue(comedi_device * dev, INT i_APCI1710_InsnReadDigitalIOChlValue(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
@ -481,7 +481,7 @@ INT i_APCI1710_InsnReadDigitalIOChlValue(comedi_device * dev,
//_INT_ i_APCI1710_SetDigitalIOChlOn (BYTE_ b_BoardHandle, //_INT_ i_APCI1710_SetDigitalIOChlOn (BYTE_ b_BoardHandle,
// BYTE_ b_ModulNbr, // BYTE_ b_ModulNbr,
// BYTE_ b_OutputChannel) // BYTE_ b_OutputChannel)
INT i_APCI1710_InsnWriteDigitalIOChlOnOff(comedi_device * dev, INT i_APCI1710_InsnWriteDigitalIOChlOnOff(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
@ -676,7 +676,7 @@ INT i_APCI1710_InsnWriteDigitalIOChlOnOff(comedi_device * dev,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
|INT i_APCI1710_InsnBitsDigitalIOPortOnOff(comedi_device *dev,comedi_subdevice |INT i_APCI1710_InsnBitsDigitalIOPortOnOff(struct comedi_device *dev,comedi_subdevice
*s, comedi_insn *insn,unsigned int *data) *s, comedi_insn *insn,unsigned int *data)
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : write: | Task : write:
@ -728,7 +728,7 @@ INT i_APCI1710_InsnWriteDigitalIOChlOnOff(comedi_device * dev,
//_INT_ i_APCI1710_SetDigitalIOPortOn (BYTE_ b_BoardHandle, //_INT_ i_APCI1710_SetDigitalIOPortOn (BYTE_ b_BoardHandle,
// BYTE_ b_ModulNbr, // BYTE_ b_ModulNbr,
// BYTE_ b_PortValue) // BYTE_ b_PortValue)
INT i_APCI1710_InsnBitsDigitalIOPortOnOff(comedi_device * dev, INT i_APCI1710_InsnBitsDigitalIOPortOnOff(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;

8
drivers/staging/comedi/drivers/addi-data/APCI1710_Dig_io.h
View File

@ -27,20 +27,20 @@
/* /*
* DIGITAL I/O INISIALISATION FUNCTION * DIGITAL I/O INISIALISATION FUNCTION
*/ */
INT i_APCI1710_InsnConfigDigitalIO(comedi_device *dev, comedi_subdevice *s, INT i_APCI1710_InsnConfigDigitalIO(struct comedi_device *dev, 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(comedi_device *dev, INT i_APCI1710_InsnReadDigitalIOChlValue(struct comedi_device *dev,
comedi_subdevice *s, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
INT i_APCI1710_InsnWriteDigitalIOChlOnOff(comedi_device *dev, INT i_APCI1710_InsnWriteDigitalIOChlOnOff(struct comedi_device *dev,
comedi_subdevice *s, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
INT i_APCI1710_InsnBitsDigitalIOPortOnOff(comedi_device *dev, INT i_APCI1710_InsnBitsDigitalIOPortOnOff(struct comedi_device *dev,
comedi_subdevice *s, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);

88
drivers/staging/comedi/drivers/addi-data/APCI1710_INCCPT.c
View File

@ -61,7 +61,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| INT i_APCI1710_InsnConfigINCCPT(comedi_device *dev,comedi_subdevice *s, | INT i_APCI1710_InsnConfigINCCPT(struct comedi_device *dev,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)
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_InsnConfigINCCPT(comedi_device * dev, comedi_subdevice * s, INT i_APCI1710_InsnConfigINCCPT(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
UINT ui_ConfigType; UINT ui_ConfigType;
@ -299,7 +299,7 @@ INT i_APCI1710_InsnConfigINCCPT(comedi_device * dev, comedi_subdevice * s,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_InitCounter(comedi_device * dev, INT i_APCI1710_InitCounter(struct comedi_device * dev,
BYTE b_ModulNbr, BYTE b_ModulNbr,
BYTE b_CounterRange, BYTE b_CounterRange,
BYTE b_FirstCounterModus, BYTE b_FirstCounterModus,
@ -545,7 +545,7 @@ INT i_APCI1710_InitCounter(comedi_device * dev,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_CounterAutoTest(comedi_device * dev, PBYTE pb_TestStatus) INT i_APCI1710_CounterAutoTest(struct comedi_device * dev, PBYTE pb_TestStatus)
{ {
BYTE b_ModulCpt = 0; BYTE b_ModulCpt = 0;
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
@ -708,7 +708,7 @@ INT i_APCI1710_CounterAutoTest(comedi_device * dev, PBYTE pb_TestStatus)
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_InitIndex(comedi_device * dev, INT i_APCI1710_InitIndex(struct comedi_device * dev,
BYTE b_ModulNbr, BYTE b_ModulNbr,
BYTE b_ReferenceAction, BYTE b_ReferenceAction,
BYTE b_IndexOperation, BYTE b_AutoMode, BYTE b_InterruptEnable) BYTE b_IndexOperation, BYTE b_AutoMode, BYTE b_InterruptEnable)
@ -1152,7 +1152,7 @@ INT i_APCI1710_InitIndex(comedi_device * dev,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_InitReference(comedi_device * dev, INT i_APCI1710_InitReference(struct comedi_device * dev,
BYTE b_ModulNbr, BYTE b_ReferenceLevel) BYTE b_ModulNbr, BYTE b_ReferenceLevel)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
@ -1277,7 +1277,7 @@ INT i_APCI1710_InitReference(comedi_device * dev,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_InitExternalStrobe(comedi_device * dev, INT i_APCI1710_InitExternalStrobe(struct comedi_device * dev,
BYTE b_ModulNbr, BYTE b_ExternalStrobe, BYTE b_ExternalStrobeLevel) BYTE b_ModulNbr, BYTE b_ExternalStrobe, BYTE b_ExternalStrobeLevel)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
@ -1391,7 +1391,7 @@ INT i_APCI1710_InitExternalStrobe(comedi_device * dev,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_InitCompareLogic(comedi_device * dev, INT i_APCI1710_InitCompareLogic(struct comedi_device * dev,
BYTE b_ModulNbr, UINT ui_CompareValue) BYTE b_ModulNbr, UINT ui_CompareValue)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
@ -1487,7 +1487,7 @@ INT i_APCI1710_InitCompareLogic(comedi_device * dev,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_InitFrequencyMeasurement(comedi_device * dev, INT i_APCI1710_InitFrequencyMeasurement(struct comedi_device * dev,
BYTE b_ModulNbr, BYTE b_ModulNbr,
BYTE b_PCIInputClock, BYTE b_PCIInputClock,
BYTE b_TimingUnity, BYTE b_TimingUnity,
@ -2002,7 +2002,7 @@ INT i_APCI1710_InitFrequencyMeasurement(comedi_device * dev,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name :INT i_APCI1710_InsnBitsINCCPT(comedi_device *dev,comedi_subdevice *s, | Function Name :INT i_APCI1710_InsnBitsINCCPT(struct comedi_device *dev,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) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_InsnBitsINCCPT(comedi_device * dev, comedi_subdevice * s, INT i_APCI1710_InsnBitsINCCPT(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
UINT ui_BitsType; UINT ui_BitsType;
@ -2091,7 +2091,7 @@ INT i_APCI1710_InsnBitsINCCPT(comedi_device * dev, comedi_subdevice * s,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_ClearCounterValue(comedi_device * dev, BYTE b_ModulNbr) INT i_APCI1710_ClearCounterValue(struct comedi_device * dev, BYTE b_ModulNbr)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
@ -2151,7 +2151,7 @@ INT i_APCI1710_ClearCounterValue(comedi_device * dev, BYTE b_ModulNbr)
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_ClearAllCounterValue(comedi_device * dev) INT i_APCI1710_ClearAllCounterValue(struct comedi_device * dev)
{ {
BYTE b_ModulCpt = 0; BYTE b_ModulCpt = 0;
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
@ -2297,7 +2297,7 @@ INT i_APCI1710_ClearAllCounterValue(comedi_device * dev)
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_SetInputFilter(comedi_device * dev, INT i_APCI1710_SetInputFilter(struct comedi_device * dev,
BYTE b_ModulNbr, BYTE b_PCIInputClock, BYTE b_Filter) BYTE b_ModulNbr, BYTE b_PCIInputClock, BYTE b_Filter)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
@ -2561,7 +2561,7 @@ INT i_APCI1710_SetInputFilter(comedi_device * dev,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_LatchCounter(comedi_device * dev, INT i_APCI1710_LatchCounter(struct comedi_device * dev,
BYTE b_ModulNbr, BYTE b_LatchReg) BYTE b_ModulNbr, BYTE b_LatchReg)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
@ -2658,7 +2658,7 @@ INT i_APCI1710_LatchCounter(comedi_device * dev,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_SetIndexAndReferenceSource(comedi_device * dev, INT i_APCI1710_SetIndexAndReferenceSource(struct comedi_device * dev,
BYTE b_ModulNbr, BYTE b_SourceSelection) BYTE b_ModulNbr, BYTE b_SourceSelection)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
@ -2795,7 +2795,7 @@ INT i_APCI1710_SetIndexAndReferenceSource(comedi_device * dev,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_SetDigitalChlOn(comedi_device * dev, BYTE b_ModulNbr) INT i_APCI1710_SetDigitalChlOn(struct comedi_device * dev, BYTE b_ModulNbr)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
@ -2875,7 +2875,7 @@ INT i_APCI1710_SetDigitalChlOn(comedi_device * dev, BYTE b_ModulNbr)
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_SetDigitalChlOff(comedi_device * dev, BYTE b_ModulNbr) INT i_APCI1710_SetDigitalChlOff(struct comedi_device * dev, BYTE b_ModulNbr)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
@ -2939,7 +2939,7 @@ INT i_APCI1710_SetDigitalChlOff(comedi_device * dev, BYTE b_ModulNbr)
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name :INT i_APCI1710_InsnWriteINCCPT(comedi_device *dev,comedi_subdevice *s, | Function Name :INT i_APCI1710_InsnWriteINCCPT(struct comedi_device *dev,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) |
| Return Value : | Return Value :
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_InsnWriteINCCPT(comedi_device * dev, comedi_subdevice * s, INT i_APCI1710_InsnWriteINCCPT(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
UINT ui_WriteType; UINT ui_WriteType;
@ -3047,7 +3047,7 @@ INT i_APCI1710_InsnWriteINCCPT(comedi_device * dev, comedi_subdevice * s,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_EnableLatchInterrupt(comedi_device * dev, BYTE b_ModulNbr) INT i_APCI1710_EnableLatchInterrupt(struct comedi_device * dev, BYTE b_ModulNbr)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
@ -3133,7 +3133,7 @@ INT i_APCI1710_EnableLatchInterrupt(comedi_device * dev, BYTE b_ModulNbr)
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_DisableLatchInterrupt(comedi_device * dev, BYTE b_ModulNbr) INT i_APCI1710_DisableLatchInterrupt(struct comedi_device * dev, BYTE b_ModulNbr)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
@ -3231,7 +3231,7 @@ INT i_APCI1710_DisableLatchInterrupt(comedi_device * dev, BYTE b_ModulNbr)
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_Write16BitCounterValue(comedi_device * dev, INT i_APCI1710_Write16BitCounterValue(struct comedi_device * dev,
BYTE b_ModulNbr, BYTE b_SelectedCounter, UINT ui_WriteValue) BYTE b_ModulNbr, BYTE b_SelectedCounter, UINT ui_WriteValue)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
@ -3316,7 +3316,7 @@ INT i_APCI1710_Write16BitCounterValue(comedi_device * dev,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_Write32BitCounterValue(comedi_device * dev, INT i_APCI1710_Write32BitCounterValue(struct comedi_device * dev,
BYTE b_ModulNbr, ULONG ul_WriteValue) BYTE b_ModulNbr, ULONG ul_WriteValue)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
@ -3383,7 +3383,7 @@ INT i_APCI1710_Write32BitCounterValue(comedi_device * dev,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_EnableIndex(comedi_device * dev, BYTE b_ModulNbr) INT i_APCI1710_EnableIndex(struct comedi_device * dev, BYTE b_ModulNbr)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
ULONG ul_InterruptLatchReg; ULONG ul_InterruptLatchReg;
@ -3481,7 +3481,7 @@ INT i_APCI1710_EnableIndex(comedi_device * dev, BYTE b_ModulNbr)
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_DisableIndex(comedi_device * dev, BYTE b_ModulNbr) INT i_APCI1710_DisableIndex(struct comedi_device * dev, BYTE b_ModulNbr)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
@ -3580,7 +3580,7 @@ INT i_APCI1710_DisableIndex(comedi_device * dev, BYTE b_ModulNbr)
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_EnableCompareLogic(comedi_device * dev, BYTE b_ModulNbr) INT i_APCI1710_EnableCompareLogic(struct comedi_device * dev, BYTE b_ModulNbr)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
@ -3680,7 +3680,7 @@ INT i_APCI1710_EnableCompareLogic(comedi_device * dev, BYTE b_ModulNbr)
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_DisableCompareLogic(comedi_device * dev, BYTE b_ModulNbr) INT i_APCI1710_DisableCompareLogic(struct comedi_device * dev, BYTE b_ModulNbr)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
@ -3789,7 +3789,7 @@ INT i_APCI1710_DisableCompareLogic(comedi_device * dev, BYTE b_ModulNbr)
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_EnableFrequencyMeasurement(comedi_device * dev, INT i_APCI1710_EnableFrequencyMeasurement(struct comedi_device * dev,
BYTE b_ModulNbr, BYTE b_InterruptEnable) BYTE b_ModulNbr, BYTE b_InterruptEnable)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
@ -3936,7 +3936,7 @@ INT i_APCI1710_EnableFrequencyMeasurement(comedi_device * dev,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_DisableFrequencyMeasurement(comedi_device * dev, BYTE b_ModulNbr) INT i_APCI1710_DisableFrequencyMeasurement(struct comedi_device * dev, BYTE b_ModulNbr)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
@ -4037,7 +4037,7 @@ INT i_APCI1710_DisableFrequencyMeasurement(comedi_device * dev, BYTE b_ModulNbr)
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name :INT i_APCI1710_InsnWriteINCCPT(comedi_device *dev,comedi_subdevice *s, | Function Name :INT i_APCI1710_InsnWriteINCCPT(struct comedi_device *dev,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) |
| Return Value : | Return Value :
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_InsnReadINCCPT(comedi_device * dev, comedi_subdevice * s, INT i_APCI1710_InsnReadINCCPT(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
UINT ui_ReadType; UINT ui_ReadType;
@ -4193,7 +4193,7 @@ INT i_APCI1710_InsnReadINCCPT(comedi_device * dev, comedi_subdevice * s,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_ReadLatchRegisterStatus(comedi_device * dev, INT i_APCI1710_ReadLatchRegisterStatus(struct comedi_device * dev,
BYTE b_ModulNbr, BYTE b_LatchReg, PBYTE pb_LatchStatus) BYTE b_ModulNbr, BYTE b_LatchReg, PBYTE pb_LatchStatus)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
@ -4280,7 +4280,7 @@ INT i_APCI1710_ReadLatchRegisterStatus(comedi_device * dev,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_ReadLatchRegisterValue(comedi_device * dev, INT i_APCI1710_ReadLatchRegisterValue(struct comedi_device * dev,
BYTE b_ModulNbr, BYTE b_LatchReg, PULONG pul_LatchValue) BYTE b_ModulNbr, BYTE b_LatchReg, PULONG pul_LatchValue)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
@ -4364,7 +4364,7 @@ INT i_APCI1710_ReadLatchRegisterValue(comedi_device * dev,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_Read16BitCounterValue(comedi_device * dev, INT i_APCI1710_Read16BitCounterValue(struct comedi_device * dev,
BYTE b_ModulNbr, BYTE b_SelectedCounter, PUINT pui_CounterValue) BYTE b_ModulNbr, BYTE b_SelectedCounter, PUINT pui_CounterValue)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
@ -4459,7 +4459,7 @@ INT i_APCI1710_Read16BitCounterValue(comedi_device * dev,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_Read32BitCounterValue(comedi_device * dev, INT i_APCI1710_Read32BitCounterValue(struct comedi_device * dev,
BYTE b_ModulNbr, PULONG pul_CounterValue) BYTE b_ModulNbr, PULONG pul_CounterValue)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
@ -4535,7 +4535,7 @@ INT i_APCI1710_Read32BitCounterValue(comedi_device * dev,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_GetIndexStatus(comedi_device * dev, INT i_APCI1710_GetIndexStatus(struct comedi_device * dev,
BYTE b_ModulNbr, PBYTE pb_IndexStatus) BYTE b_ModulNbr, PBYTE pb_IndexStatus)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
@ -4619,7 +4619,7 @@ INT i_APCI1710_GetIndexStatus(comedi_device * dev,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_GetReferenceStatus(comedi_device * dev, INT i_APCI1710_GetReferenceStatus(struct comedi_device * dev,
BYTE b_ModulNbr, PBYTE pb_ReferenceStatus) BYTE b_ModulNbr, PBYTE pb_ReferenceStatus)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
@ -4703,7 +4703,7 @@ INT i_APCI1710_GetReferenceStatus(comedi_device * dev,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_GetUASStatus(comedi_device * dev, INT i_APCI1710_GetUASStatus(struct comedi_device * dev,
BYTE b_ModulNbr, PBYTE pb_UASStatus) BYTE b_ModulNbr, PBYTE pb_UASStatus)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
@ -4771,7 +4771,7 @@ INT i_APCI1710_GetUASStatus(comedi_device * dev,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_GetCBStatus(comedi_device * dev, INT i_APCI1710_GetCBStatus(struct comedi_device * dev,
BYTE b_ModulNbr, PBYTE pb_CBStatus) BYTE b_ModulNbr, PBYTE pb_CBStatus)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
@ -4853,7 +4853,7 @@ INT i_APCI1710_GetCBStatus(comedi_device * dev,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_Get16BitCBStatus(comedi_device * dev, INT i_APCI1710_Get16BitCBStatus(struct comedi_device * dev,
BYTE b_ModulNbr, PBYTE pb_CBStatusCounter0, PBYTE pb_CBStatusCounter1) BYTE b_ModulNbr, PBYTE pb_CBStatusCounter0, PBYTE pb_CBStatusCounter1)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
@ -4966,7 +4966,7 @@ INT i_APCI1710_Get16BitCBStatus(comedi_device * dev,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_GetUDStatus(comedi_device * dev, INT i_APCI1710_GetUDStatus(struct comedi_device * dev,
BYTE b_ModulNbr, PBYTE pb_UDStatus) BYTE b_ModulNbr, PBYTE pb_UDStatus)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
@ -5040,7 +5040,7 @@ INT i_APCI1710_GetUDStatus(comedi_device * dev,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_GetInterruptUDLatchedStatus(comedi_device * dev, INT i_APCI1710_GetInterruptUDLatchedStatus(struct comedi_device * dev,
BYTE b_ModulNbr, PBYTE pb_UDStatus) BYTE b_ModulNbr, PBYTE pb_UDStatus)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
@ -5145,7 +5145,7 @@ INT i_APCI1710_GetInterruptUDLatchedStatus(comedi_device * dev,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_ReadFrequencyMeasurement(comedi_device * dev, INT i_APCI1710_ReadFrequencyMeasurement(struct comedi_device * dev,
BYTE b_ModulNbr, BYTE b_ModulNbr,
PBYTE pb_Status, PBYTE pb_UDStatus, PULONG pul_ReadValue) PBYTE pb_Status, PBYTE pb_UDStatus, PULONG pul_ReadValue)
{ {

80
drivers/staging/comedi/drivers/addi-data/APCI1710_INCCPT.h
View File

@ -132,22 +132,22 @@
#define APCI1710_INCCPT_DISABLEFREQUENCYMEASUREMENT 409 #define APCI1710_INCCPT_DISABLEFREQUENCYMEASUREMENT 409
/************ Main Functions *************/ /************ Main Functions *************/
INT i_APCI1710_InsnConfigINCCPT(comedi_device *dev, comedi_subdevice *s, INT i_APCI1710_InsnConfigINCCPT(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int * data); comedi_insn *insn, unsigned int * data);
INT i_APCI1710_InsnBitsINCCPT(comedi_device *dev, comedi_subdevice * s, INT i_APCI1710_InsnBitsINCCPT(struct comedi_device *dev, comedi_subdevice * s,
comedi_insn *insn, unsigned int * data); comedi_insn *insn, unsigned int * data);
INT i_APCI1710_InsnWriteINCCPT(comedi_device *dev, comedi_subdevice * s, INT i_APCI1710_InsnWriteINCCPT(struct comedi_device *dev, comedi_subdevice * s,
comedi_insn *insn, unsigned int * data); comedi_insn *insn, unsigned int * data);
INT i_APCI1710_InsnReadINCCPT(comedi_device *dev, comedi_subdevice * s, INT i_APCI1710_InsnReadINCCPT(struct comedi_device *dev, comedi_subdevice * s,
comedi_insn *insn, unsigned int * data); comedi_insn *insn, unsigned int * data);
/*********** Supplementary Functions********/ /*********** Supplementary Functions********/
/* INSN CONFIG */ /* INSN CONFIG */
INT i_APCI1710_InitCounter(comedi_device *dev, INT i_APCI1710_InitCounter(struct comedi_device *dev,
BYTE b_ModulNbr, BYTE b_ModulNbr,
BYTE b_CounterRange, BYTE b_CounterRange,
BYTE b_FirstCounterModus, BYTE b_FirstCounterModus,
@ -155,25 +155,25 @@ INT i_APCI1710_InitCounter(comedi_device *dev,
BYTE b_SecondCounterModus, BYTE b_SecondCounterModus,
BYTE b_SecondCounterOption); BYTE b_SecondCounterOption);
INT i_APCI1710_CounterAutoTest(comedi_device *dev, PBYTE pb_TestStatus); INT i_APCI1710_CounterAutoTest(struct comedi_device *dev, PBYTE pb_TestStatus);
INT i_APCI1710_InitIndex(comedi_device *dev, INT i_APCI1710_InitIndex(struct comedi_device *dev,
BYTE b_ModulNbr, BYTE b_ModulNbr,
BYTE b_ReferenceAction, BYTE b_ReferenceAction,
BYTE b_IndexOperation, BYTE b_AutoMode, BYTE b_IndexOperation, BYTE b_AutoMode,
BYTE b_InterruptEnable); BYTE b_InterruptEnable);
INT i_APCI1710_InitReference(comedi_device *dev, INT i_APCI1710_InitReference(struct comedi_device *dev,
BYTE b_ModulNbr, BYTE b_ReferenceLevel); BYTE b_ModulNbr, BYTE b_ReferenceLevel);
INT i_APCI1710_InitExternalStrobe(comedi_device *dev, INT i_APCI1710_InitExternalStrobe(struct comedi_device *dev,
BYTE b_ModulNbr, BYTE b_ExternalStrobe, BYTE b_ModulNbr, BYTE b_ExternalStrobe,
BYTE b_ExternalStrobeLevel); BYTE b_ExternalStrobeLevel);
INT i_APCI1710_InitCompareLogic(comedi_device *dev, INT i_APCI1710_InitCompareLogic(struct comedi_device *dev,
BYTE b_ModulNbr, UINT ui_CompareValue); BYTE b_ModulNbr, UINT ui_CompareValue);
INT i_APCI1710_InitFrequencyMeasurement(comedi_device *dev, INT i_APCI1710_InitFrequencyMeasurement(struct comedi_device *dev,
BYTE b_ModulNbr, BYTE b_ModulNbr,
BYTE b_PCIInputClock, BYTE b_PCIInputClock,
BYTE b_TimingUnity, BYTE b_TimingUnity,
@ -181,91 +181,91 @@ INT i_APCI1710_InitFrequencyMeasurement(comedi_device *dev,
PULONG pul_RealTimingInterval); PULONG pul_RealTimingInterval);
/* INSN BITS */ /* INSN BITS */
INT i_APCI1710_ClearCounterValue(comedi_device *dev, BYTE b_ModulNbr); INT i_APCI1710_ClearCounterValue(struct comedi_device *dev, BYTE b_ModulNbr);
INT i_APCI1710_ClearAllCounterValue(comedi_device *dev); INT i_APCI1710_ClearAllCounterValue(struct comedi_device *dev);
INT i_APCI1710_SetInputFilter(comedi_device *dev, INT i_APCI1710_SetInputFilter(struct comedi_device *dev,
BYTE b_ModulNbr, BYTE b_PCIInputClock, BYTE b_ModulNbr, BYTE b_PCIInputClock,
BYTE b_Filter); BYTE b_Filter);
INT i_APCI1710_LatchCounter(comedi_device *dev, INT i_APCI1710_LatchCounter(struct comedi_device *dev,
BYTE b_ModulNbr, BYTE b_LatchReg); BYTE b_ModulNbr, BYTE b_LatchReg);
INT i_APCI1710_SetIndexAndReferenceSource(comedi_device *dev, INT i_APCI1710_SetIndexAndReferenceSource(struct comedi_device *dev,
BYTE b_ModulNbr, BYTE b_ModulNbr,
BYTE b_SourceSelection); BYTE b_SourceSelection);
INT i_APCI1710_SetDigitalChlOn(comedi_device *dev, BYTE b_ModulNbr); INT i_APCI1710_SetDigitalChlOn(struct comedi_device *dev, BYTE b_ModulNbr);
INT i_APCI1710_SetDigitalChlOff(comedi_device *dev, BYTE b_ModulNbr); INT i_APCI1710_SetDigitalChlOff(struct comedi_device *dev, BYTE b_ModulNbr);
/* INSN WRITE */ /* INSN WRITE */
INT i_APCI1710_EnableLatchInterrupt(comedi_device *dev, BYTE b_ModulNbr); INT i_APCI1710_EnableLatchInterrupt(struct comedi_device *dev, BYTE b_ModulNbr);
INT i_APCI1710_DisableLatchInterrupt(comedi_device *dev, BYTE b_ModulNbr); INT i_APCI1710_DisableLatchInterrupt(struct comedi_device *dev, BYTE b_ModulNbr);
INT i_APCI1710_Write16BitCounterValue(comedi_device *dev, INT i_APCI1710_Write16BitCounterValue(struct comedi_device *dev,
BYTE b_ModulNbr, BYTE b_SelectedCounter, BYTE b_ModulNbr, BYTE b_SelectedCounter,
UINT ui_WriteValue); UINT ui_WriteValue);
INT i_APCI1710_Write32BitCounterValue(comedi_device *dev, INT i_APCI1710_Write32BitCounterValue(struct comedi_device *dev,
BYTE b_ModulNbr, ULONG ul_WriteValue); BYTE b_ModulNbr, ULONG ul_WriteValue);
INT i_APCI1710_EnableIndex(comedi_device *dev, BYTE b_ModulNbr); INT i_APCI1710_EnableIndex(struct comedi_device *dev, BYTE b_ModulNbr);
INT i_APCI1710_DisableIndex(comedi_device *dev, BYTE b_ModulNbr); INT i_APCI1710_DisableIndex(struct comedi_device *dev, BYTE b_ModulNbr);
INT i_APCI1710_EnableCompareLogic(comedi_device *dev, BYTE b_ModulNbr); INT i_APCI1710_EnableCompareLogic(struct comedi_device *dev, BYTE b_ModulNbr);
INT i_APCI1710_DisableCompareLogic(comedi_device *dev, BYTE b_ModulNbr); INT i_APCI1710_DisableCompareLogic(struct comedi_device *dev, BYTE b_ModulNbr);
INT i_APCI1710_EnableFrequencyMeasurement(comedi_device *dev, INT i_APCI1710_EnableFrequencyMeasurement(struct comedi_device *dev,
BYTE b_ModulNbr, BYTE b_ModulNbr,
BYTE b_InterruptEnable); BYTE b_InterruptEnable);
INT i_APCI1710_DisableFrequencyMeasurement(comedi_device *dev, INT i_APCI1710_DisableFrequencyMeasurement(struct comedi_device *dev,
BYTE b_ModulNbr); BYTE b_ModulNbr);
/* INSN READ */ /* INSN READ */
INT i_APCI1710_ReadLatchRegisterStatus(comedi_device *dev, INT i_APCI1710_ReadLatchRegisterStatus(struct comedi_device *dev,
BYTE b_ModulNbr, BYTE b_LatchReg, BYTE b_ModulNbr, BYTE b_LatchReg,
PBYTE pb_LatchStatus); PBYTE pb_LatchStatus);
INT i_APCI1710_ReadLatchRegisterValue(comedi_device *dev, INT i_APCI1710_ReadLatchRegisterValue(struct comedi_device *dev,
BYTE b_ModulNbr, BYTE b_LatchReg, BYTE b_ModulNbr, BYTE b_LatchReg,
PULONG pul_LatchValue); PULONG pul_LatchValue);
INT i_APCI1710_Read16BitCounterValue(comedi_device *dev, INT i_APCI1710_Read16BitCounterValue(struct comedi_device *dev,
BYTE b_ModulNbr, BYTE b_SelectedCounter, BYTE b_ModulNbr, BYTE b_SelectedCounter,
PUINT pui_CounterValue); PUINT pui_CounterValue);
INT i_APCI1710_Read32BitCounterValue(comedi_device *dev, INT i_APCI1710_Read32BitCounterValue(struct comedi_device *dev,
BYTE b_ModulNbr, PULONG pul_CounterValue); BYTE b_ModulNbr, PULONG pul_CounterValue);
INT i_APCI1710_GetIndexStatus(comedi_device *dev, INT i_APCI1710_GetIndexStatus(struct comedi_device *dev,
BYTE b_ModulNbr, PBYTE pb_IndexStatus); BYTE b_ModulNbr, PBYTE pb_IndexStatus);
INT i_APCI1710_GetReferenceStatus(comedi_device *dev, INT i_APCI1710_GetReferenceStatus(struct comedi_device *dev,
BYTE b_ModulNbr, PBYTE pb_ReferenceStatus); BYTE b_ModulNbr, PBYTE pb_ReferenceStatus);
INT i_APCI1710_GetUASStatus(comedi_device *dev, INT i_APCI1710_GetUASStatus(struct comedi_device *dev,
BYTE b_ModulNbr, PBYTE pb_UASStatus); BYTE b_ModulNbr, PBYTE pb_UASStatus);
INT i_APCI1710_GetCBStatus(comedi_device *dev, INT i_APCI1710_GetCBStatus(struct comedi_device *dev,
BYTE b_ModulNbr, PBYTE pb_CBStatus); BYTE b_ModulNbr, PBYTE pb_CBStatus);
INT i_APCI1710_Get16BitCBStatus(comedi_device *dev, INT i_APCI1710_Get16BitCBStatus(struct comedi_device *dev,
BYTE b_ModulNbr, PBYTE pb_CBStatusCounter0, BYTE b_ModulNbr, PBYTE pb_CBStatusCounter0,
PBYTE pb_CBStatusCounter1); PBYTE pb_CBStatusCounter1);
INT i_APCI1710_GetUDStatus(comedi_device *dev, INT i_APCI1710_GetUDStatus(struct comedi_device *dev,
BYTE b_ModulNbr, PBYTE pb_UDStatus); BYTE b_ModulNbr, PBYTE pb_UDStatus);
INT i_APCI1710_GetInterruptUDLatchedStatus(comedi_device *dev, INT i_APCI1710_GetInterruptUDLatchedStatus(struct comedi_device *dev,
BYTE b_ModulNbr, PBYTE pb_UDStatus); BYTE b_ModulNbr, PBYTE pb_UDStatus);
INT i_APCI1710_ReadFrequencyMeasurement(comedi_device *dev, INT i_APCI1710_ReadFrequencyMeasurement(struct comedi_device *dev,
BYTE b_ModulNbr, BYTE b_ModulNbr,
PBYTE pb_Status, PBYTE pb_UDStatus, PBYTE pb_Status, PBYTE pb_UDStatus,
PULONG pul_ReadValue); PULONG pul_ReadValue);

8
drivers/staging/comedi/drivers/addi-data/APCI1710_Inp_cpt.c
View File

@ -123,7 +123,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_InsnConfigInitPulseEncoder(comedi_device * dev, INT i_APCI1710_InsnConfigInitPulseEncoder(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
@ -414,7 +414,7 @@ INT i_APCI1710_InsnConfigInitPulseEncoder(comedi_device * dev,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_InsnWriteEnableDisablePulseEncoder(comedi_device * dev, INT i_APCI1710_InsnWriteEnableDisablePulseEncoder(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
@ -708,7 +708,7 @@ INT i_APCI1710_InsnWriteEnableDisablePulseEncoder(comedi_device * dev,
PBYTE_ pb_Status) PBYTE_ pb_Status)
*/ */
INT i_APCI1710_InsnBitsReadWritePulseEncoder(comedi_device * dev, INT i_APCI1710_InsnBitsReadWritePulseEncoder(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
@ -834,7 +834,7 @@ INT i_APCI1710_InsnBitsReadWritePulseEncoder(comedi_device * dev,
return (i_ReturnValue); return (i_ReturnValue);
} }
INT i_APCI1710_InsnReadInterruptPulseEncoder(comedi_device * dev, INT i_APCI1710_InsnReadInterruptPulseEncoder(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {

8
drivers/staging/comedi/drivers/addi-data/APCI1710_Inp_cpt.h
View File

@ -21,11 +21,11 @@
#define APCI1710_PULSEENCODER_READ 0 #define APCI1710_PULSEENCODER_READ 0
#define APCI1710_PULSEENCODER_WRITE 1 #define APCI1710_PULSEENCODER_WRITE 1
INT i_APCI1710_InsnConfigInitPulseEncoder(comedi_device *dev, INT i_APCI1710_InsnConfigInitPulseEncoder(struct comedi_device *dev,
comedi_subdevice *s, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
INT i_APCI1710_InsnWriteEnableDisablePulseEncoder(comedi_device *dev, INT i_APCI1710_InsnWriteEnableDisablePulseEncoder(struct comedi_device *dev,
comedi_subdevice *s, comedi_subdevice *s,
comedi_insn *insn, comedi_insn *insn,
unsigned int *data); unsigned int *data);
@ -33,7 +33,7 @@ INT i_APCI1710_InsnWriteEnableDisablePulseEncoder(comedi_device *dev,
/* /*
* READ PULSE ENCODER FUNCTIONS * READ PULSE ENCODER FUNCTIONS
*/ */
INT i_APCI1710_InsnReadInterruptPulseEncoder(comedi_device *dev, INT i_APCI1710_InsnReadInterruptPulseEncoder(struct comedi_device *dev,
comedi_subdevice *s, comedi_subdevice *s,
comedi_insn *insn, comedi_insn *insn,
unsigned int *data); unsigned int *data);
@ -41,7 +41,7 @@ INT i_APCI1710_InsnReadInterruptPulseEncoder(comedi_device *dev,
/* /*
* WRITE PULSE ENCODER FUNCTIONS * WRITE PULSE ENCODER FUNCTIONS
*/ */
INT i_APCI1710_InsnBitsReadWritePulseEncoder(comedi_device *dev, INT i_APCI1710_InsnBitsReadWritePulseEncoder(struct comedi_device *dev,
comedi_subdevice *s, comedi_subdevice *s,
comedi_insn *insn, comedi_insn *insn,
unsigned int *data); unsigned int *data);

22
drivers/staging/comedi/drivers/addi-data/APCI1710_Pwm.c
View File

@ -57,7 +57,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name :INT i_APCI1710_InsnConfigPWM(comedi_device *dev, | Function Name :INT i_APCI1710_InsnConfigPWM(struct comedi_device *dev,
comedi_subdevice *s,comedi_insn *insn,unsigned int *data) | 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)
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_InsnConfigPWM(comedi_device * dev, comedi_subdevice * s, INT i_APCI1710_InsnConfigPWM(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
BYTE b_ConfigType; BYTE b_ConfigType;
@ -179,7 +179,7 @@ INT i_APCI1710_InsnConfigPWM(comedi_device * dev, comedi_subdevice * s,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_InitPWM(comedi_device * dev, INT i_APCI1710_InitPWM(struct comedi_device * dev,
BYTE b_ModulNbr, BYTE b_ModulNbr,
BYTE b_PWM, BYTE b_PWM,
BYTE b_ClockSelection, BYTE b_ClockSelection,
@ -1534,7 +1534,7 @@ INT i_APCI1710_InitPWM(comedi_device * dev,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_GetPWMInitialisation(comedi_device * dev, INT i_APCI1710_GetPWMInitialisation(struct comedi_device * dev,
BYTE b_ModulNbr, BYTE b_ModulNbr,
BYTE b_PWM, BYTE b_PWM,
PBYTE pb_TimingUnit, PBYTE pb_TimingUnit,
@ -1670,7 +1670,7 @@ INT i_APCI1710_GetPWMInitialisation(comedi_device * dev,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name :INT i_APCI1710_InsnWritePWM(comedi_device *dev, | Function Name :INT i_APCI1710_InsnWritePWM(struct comedi_device *dev,
comedi_subdevice *s,comedi_insn *insn,unsigned int *data) | 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)
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_InsnWritePWM(comedi_device * dev, comedi_subdevice * s, INT i_APCI1710_InsnWritePWM(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
BYTE b_WriteType; BYTE b_WriteType;
@ -1806,7 +1806,7 @@ INT i_APCI1710_InsnWritePWM(comedi_device * dev, comedi_subdevice * s,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_EnablePWM(comedi_device * dev, INT i_APCI1710_EnablePWM(struct comedi_device * dev,
BYTE b_ModulNbr, BYTE b_ModulNbr,
BYTE b_PWM, BYTE b_PWM,
BYTE b_StartLevel, BYTE b_StartLevel,
@ -2062,7 +2062,7 @@ INT i_APCI1710_EnablePWM(comedi_device * dev,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_DisablePWM(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_ReturnValue = 0; INT i_ReturnValue = 0;
DWORD dw_Status; DWORD dw_Status;
@ -2189,7 +2189,7 @@ INT i_APCI1710_DisablePWM(comedi_device * dev, BYTE b_ModulNbr, BYTE b_PWM)
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_SetNewPWMTiming(comedi_device * dev, INT i_APCI1710_SetNewPWMTiming(struct comedi_device * dev,
BYTE b_ModulNbr, BYTE b_ModulNbr,
BYTE b_PWM, BYTE b_TimingUnit, ULONG ul_LowTiming, ULONG ul_HighTiming) BYTE b_PWM, BYTE b_TimingUnit, ULONG ul_LowTiming, ULONG ul_HighTiming)
{ {
@ -3460,7 +3460,7 @@ INT i_APCI1710_SetNewPWMTiming(comedi_device * dev,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_InsnReadGetPWMStatus(comedi_device * dev, comedi_subdevice * s, INT i_APCI1710_InsnReadGetPWMStatus(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
@ -3561,7 +3561,7 @@ INT i_APCI1710_InsnReadGetPWMStatus(comedi_device * dev, comedi_subdevice * s,
return (i_ReturnValue); return (i_ReturnValue);
} }
INT i_APCI1710_InsnBitsReadPWMInterrupt(comedi_device * dev, INT i_APCI1710_InsnBitsReadPWMInterrupt(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
data[0] = devpriv->s_InterruptParameters. data[0] = devpriv->s_InterruptParameters.

18
drivers/staging/comedi/drivers/addi-data/APCI1710_Pwm.h
View File

@ -26,10 +26,10 @@
#define APCI1710_PWM_ENABLE 1 #define APCI1710_PWM_ENABLE 1
#define APCI1710_PWM_NEWTIMING 2 #define APCI1710_PWM_NEWTIMING 2
INT i_APCI1710_InsnConfigPWM(comedi_device *dev, comedi_subdevice *s, INT i_APCI1710_InsnConfigPWM(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
INT i_APCI1710_InitPWM(comedi_device *dev, INT i_APCI1710_InitPWM(struct comedi_device *dev,
BYTE b_ModulNbr, BYTE b_ModulNbr,
BYTE b_PWM, BYTE b_PWM,
BYTE b_ClockSelection, BYTE b_ClockSelection,
@ -38,7 +38,7 @@ INT i_APCI1710_InitPWM(comedi_device *dev,
ULONG ul_HighTiming, ULONG ul_HighTiming,
PULONG pul_RealLowTiming, PULONG pul_RealHighTiming); PULONG pul_RealLowTiming, PULONG pul_RealHighTiming);
INT i_APCI1710_GetPWMInitialisation(comedi_device *dev, INT i_APCI1710_GetPWMInitialisation(struct comedi_device *dev,
BYTE b_ModulNbr, BYTE b_ModulNbr,
BYTE b_PWM, BYTE b_PWM,
PBYTE pb_TimingUnit, PBYTE pb_TimingUnit,
@ -50,10 +50,10 @@ INT i_APCI1710_GetPWMInitialisation(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(comedi_device *dev, comedi_subdevice *s, INT i_APCI1710_InsnWritePWM(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
INT i_APCI1710_EnablePWM(comedi_device *dev, INT i_APCI1710_EnablePWM(struct comedi_device *dev,
BYTE b_ModulNbr, BYTE b_ModulNbr,
BYTE b_PWM, BYTE b_PWM,
BYTE b_StartLevel, BYTE b_StartLevel,
@ -61,16 +61,16 @@ INT i_APCI1710_EnablePWM(comedi_device *dev,
BYTE b_StopLevel, BYTE b_ExternGate, BYTE b_StopLevel, BYTE b_ExternGate,
BYTE b_InterruptEnable); BYTE b_InterruptEnable);
INT i_APCI1710_SetNewPWMTiming(comedi_device *dev, INT i_APCI1710_SetNewPWMTiming(struct comedi_device *dev,
BYTE b_ModulNbr, BYTE b_ModulNbr,
BYTE b_PWM, BYTE b_TimingUnit, BYTE b_PWM, BYTE b_TimingUnit,
ULONG ul_LowTiming, ULONG ul_HighTiming); ULONG ul_LowTiming, ULONG ul_HighTiming);
INT i_APCI1710_DisablePWM(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(comedi_device *dev, comedi_subdevice *s, INT i_APCI1710_InsnReadGetPWMStatus(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
INT i_APCI1710_InsnBitsReadPWMInterrupt(comedi_device *dev, INT i_APCI1710_InsnBitsReadPWMInterrupt(struct comedi_device *dev,
comedi_subdevice *s, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);

8
drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.c
View File

@ -133,7 +133,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_InsnConfigInitSSI(comedi_device * dev, comedi_subdevice * s, INT i_APCI1710_InsnConfigInitSSI(struct comedi_device * dev, 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(comedi_device * dev, comedi_subdevice * s,
| BYTE_ b_SelectedSSI, | | BYTE_ b_SelectedSSI, |
| PULONG_ pul_Position, | | PULONG_ pul_Position, |
| PULONG_ pul_TurnCpt) | PULONG_ pul_TurnCpt)
INT i_APCI1710_ReadSSIValue(comedi_device *dev,comedi_subdevice *s, INT i_APCI1710_ReadSSIValue(struct comedi_device *dev,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];
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_InsnReadSSIValue(comedi_device * dev, comedi_subdevice * s, INT i_APCI1710_InsnReadSSIValue(struct comedi_device * dev, 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(comedi_device * dev, comedi_subdevice * s,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_InsnBitsSSIDigitalIO(comedi_device * dev, comedi_subdevice * s, INT i_APCI1710_InsnBitsSSIDigitalIO(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;

6
drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.h
View File

@ -33,11 +33,11 @@
/* /*
* SSI INISIALISATION FUNCTION * SSI INISIALISATION FUNCTION
*/ */
INT i_APCI1710_InsnConfigInitSSI(comedi_device *dev, comedi_subdevice *s, INT i_APCI1710_InsnConfigInitSSI(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
INT i_APCI1710_InsnReadSSIValue(comedi_device *dev, comedi_subdevice *s, INT i_APCI1710_InsnReadSSIValue(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
INT i_APCI1710_InsnBitsSSIDigitalIO(comedi_device *dev, comedi_subdevice *s, INT i_APCI1710_InsnBitsSSIDigitalIO(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);

8
drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.c
View File

@ -130,7 +130,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_InsnConfigInitTorCounter(comedi_device * dev, INT i_APCI1710_InsnConfigInitTorCounter(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
@ -987,7 +987,7 @@ INT i_APCI1710_InsnConfigInitTorCounter(comedi_device * dev,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_InsnWriteEnableDisableTorCounter(comedi_device * dev, INT i_APCI1710_InsnWriteEnableDisableTorCounter(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
@ -1460,7 +1460,7 @@ INT i_APCI1710_InsnWriteEnableDisableTorCounter(comedi_device * dev,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_InsnReadGetTorCounterInitialisation(comedi_device * dev, INT i_APCI1710_InsnReadGetTorCounterInitialisation(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
@ -1700,7 +1700,7 @@ INT i_APCI1710_InsnReadGetTorCounterInitialisation(comedi_device * dev,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_InsnBitsGetTorCounterProgressStatusAndValue(comedi_device * dev, INT i_APCI1710_InsnBitsGetTorCounterProgressStatusAndValue(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;

8
drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.h
View File

@ -35,23 +35,23 @@
/* /*
* TOR_COUNTER INISIALISATION FUNCTION * TOR_COUNTER INISIALISATION FUNCTION
*/ */
INT i_APCI1710_InsnConfigInitTorCounter(comedi_device *dev, INT i_APCI1710_InsnConfigInitTorCounter(struct comedi_device *dev,
comedi_subdevice *s, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
INT i_APCI1710_InsnWriteEnableDisableTorCounter(comedi_device *dev, INT i_APCI1710_InsnWriteEnableDisableTorCounter(struct comedi_device *dev,
comedi_subdevice *s, comedi_subdevice *s,
comedi_insn *insn, comedi_insn *insn,
unsigned int *data); unsigned int *data);
INT i_APCI1710_InsnReadGetTorCounterInitialisation(comedi_device *dev, INT i_APCI1710_InsnReadGetTorCounterInitialisation(struct comedi_device *dev,
comedi_subdevice *s, 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(comedi_device *dev, INT i_APCI1710_InsnBitsGetTorCounterProgressStatusAndValue(struct comedi_device *dev,
comedi_subdevice *s, comedi_subdevice *s,
comedi_insn *insn, comedi_insn *insn,
unsigned int *data); unsigned int *data);

10
drivers/staging/comedi/drivers/addi-data/APCI1710_Ttl.c
View File

@ -100,7 +100,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_InsnConfigInitTTLIO(comedi_device * dev, comedi_subdevice * s, INT i_APCI1710_InsnConfigInitTTLIO(struct comedi_device * dev, 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
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_InsnBitsReadTTLIO(comedi_device * dev, comedi_subdevice * s, INT i_APCI1710_InsnBitsReadTTLIO(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
@ -655,7 +655,7 @@ INT i_APCI1710_InsnBitsReadTTLIO(comedi_device * dev, comedi_subdevice * s,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_InsnReadTTLIOAllPortValue(comedi_device * dev, INT i_APCI1710_InsnReadTTLIOAllPortValue(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;
@ -792,7 +792,7 @@ INT i_APCI1710_InsnReadTTLIOAllPortValue(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(comedi_device *dev,comedi_subdevice *s, INT i_APCI1710_InsnWriteSetTTLIOChlOnOff(struct comedi_device *dev,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 |
@ -825,7 +825,7 @@ INT i_APCI1710_InsnWriteSetTTLIOChlOnOff(comedi_device *dev,comedi_subdevice *s,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1710_InsnWriteSetTTLIOChlOnOff(comedi_device * dev, INT i_APCI1710_InsnWriteSetTTLIOChlOnOff(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
INT i_ReturnValue = 0; INT i_ReturnValue = 0;

8
drivers/staging/comedi/drivers/addi-data/APCI1710_Ttl.h
View File

@ -24,21 +24,21 @@
/* /*
* TTL INISIALISATION FUNCTION * TTL INISIALISATION FUNCTION
*/ */
INT i_APCI1710_InsnConfigInitTTLIO(comedi_device *dev, comedi_subdevice *s, INT i_APCI1710_InsnConfigInitTTLIO(struct comedi_device *dev, 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(comedi_device *dev, comedi_subdevice *s, INT i_APCI1710_InsnBitsReadTTLIO(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
INT i_APCI1710_InsnReadTTLIOAllPortValue(comedi_device *dev, INT i_APCI1710_InsnReadTTLIOAllPortValue(struct comedi_device *dev,
comedi_subdevice *s, 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(comedi_device *dev, INT i_APCI1710_InsnWriteSetTTLIOChlOnOff(struct comedi_device *dev,
comedi_subdevice *s, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);

26
drivers/staging/comedi/drivers/addi-data/addi_common.c
View File

@ -2541,7 +2541,7 @@ COMEDI_PCI_INITCLEANUP(driver_addi, addi_apci_tbl);
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function name :static int i_ADDI_Attach(comedi_device *dev, | | Function name :static int i_ADDI_Attach(struct comedi_device *dev, |
| comedi_devconfig *it) | | comedi_devconfig *it) |
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@ -2550,7 +2550,7 @@ COMEDI_PCI_INITCLEANUP(driver_addi, addi_apci_tbl);
| This function does all the initializations and memory | | This function does all the initializations and memory |
| allocation of data structures for the driver. | | allocation of data structures for the driver. |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters :comedi_device *dev | | Input Parameters :struct comedi_device *dev |
| comedi_devconfig *it | | comedi_devconfig *it |
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@ -2559,7 +2559,7 @@ COMEDI_PCI_INITCLEANUP(driver_addi, addi_apci_tbl);
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
static int i_ADDI_Attach(comedi_device * dev, comedi_devconfig * it) static int i_ADDI_Attach(struct comedi_device * dev, comedi_devconfig * it)
{ {
comedi_subdevice *s; comedi_subdevice *s;
int ret, pages, i, n_subdevices; int ret, pages, i, n_subdevices;
@ -2909,7 +2909,7 @@ static int i_ADDI_Attach(comedi_device * dev, comedi_devconfig * it)
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function name : static int i_ADDI_Detach(comedi_device *dev) | | Function name : static int i_ADDI_Detach(struct comedi_device *dev) |
| | | |
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@ -2917,7 +2917,7 @@ static int i_ADDI_Attach(comedi_device * dev, comedi_devconfig * it)
| Free the DMA buffers, unregister irq. | | Free the DMA buffers, unregister irq. |
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev | | Input Parameters : struct comedi_device *dev |
| | | |
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@ -2926,7 +2926,7 @@ static int i_ADDI_Attach(comedi_device * dev, comedi_devconfig * it)
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
static int i_ADDI_Detach(comedi_device * dev) static int i_ADDI_Detach(struct comedi_device * dev)
{ {
if (dev->private) { if (dev->private) {
@ -2976,14 +2976,14 @@ static int i_ADDI_Detach(comedi_device * dev)
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function name : static int i_ADDI_Reset(comedi_device *dev) | | Function name : static int i_ADDI_Reset(struct comedi_device *dev) |
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Disables all interrupts, Resets digital output to low, | | Task : Disables all interrupts, Resets digital output to low, |
| Set all analog output to low | | Set all analog output to low |
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev | | Input Parameters : struct comedi_device *dev |
| | | |
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@ -2992,7 +2992,7 @@ static int i_ADDI_Detach(comedi_device * dev)
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
static int i_ADDI_Reset(comedi_device * dev) static int i_ADDI_Reset(struct comedi_device * dev)
{ {
this_board->i_hwdrv_Reset(dev); this_board->i_hwdrv_Reset(dev);
@ -3020,7 +3020,7 @@ static int i_ADDI_Reset(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)
{ {
comedi_device *dev = d; struct comedi_device *dev = d;
this_board->v_hwdrv_Interrupt(irq, d); this_board->v_hwdrv_Interrupt(irq, d);
return IRQ_RETVAL(1); return IRQ_RETVAL(1);
} }
@ -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(comedi_device *dev,comedi_subdevice *s, |INT i_ADDIDATA_InsnReadEeprom(struct comedi_device *dev,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 :(comedi_device *dev,comedi_subdevice *s, | Input Parameters :(struct comedi_device *dev,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)
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
static int i_ADDIDATA_InsnReadEeprom(comedi_device * dev, comedi_subdevice * s, static int i_ADDIDATA_InsnReadEeprom(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
WORD w_Data; WORD w_Data;

62
drivers/staging/comedi/drivers/addi-data/addi_common.h
View File

@ -112,108 +112,108 @@ typedef struct {
/* interrupt and reset */ /* interrupt and reset */
void (*v_hwdrv_Interrupt)(int irq, void *d); void (*v_hwdrv_Interrupt)(int irq, void *d);
int (*i_hwdrv_Reset)(comedi_device *dev); int (*i_hwdrv_Reset)(struct comedi_device *dev);
/* Subdevice functions */ /* Subdevice functions */
/* ANALOG INPUT */ /* ANALOG INPUT */
int (*i_hwdrv_InsnConfigAnalogInput)(comedi_device *dev, int (*i_hwdrv_InsnConfigAnalogInput)(struct comedi_device *dev,
comedi_subdevice *s, comedi_subdevice *s,
comedi_insn *insn, comedi_insn *insn,
unsigned int *data); unsigned int *data);
int (*i_hwdrv_InsnReadAnalogInput)(comedi_device *dev, int (*i_hwdrv_InsnReadAnalogInput)(struct comedi_device *dev,
comedi_subdevice *s, comedi_subdevice *s,
comedi_insn *insn, comedi_insn *insn,
unsigned int *data); unsigned int *data);
int (*i_hwdrv_InsnWriteAnalogInput)(comedi_device *dev, int (*i_hwdrv_InsnWriteAnalogInput)(struct comedi_device *dev,
comedi_subdevice *s, comedi_subdevice *s,
comedi_insn *insn, comedi_insn *insn,
unsigned int *data); unsigned int *data);
int (*i_hwdrv_InsnBitsAnalogInput)(comedi_device *dev, int (*i_hwdrv_InsnBitsAnalogInput)(struct comedi_device *dev,
comedi_subdevice *s, comedi_subdevice *s,
comedi_insn *insn, comedi_insn *insn,
unsigned int *data); unsigned int *data);
int (*i_hwdrv_CommandTestAnalogInput)(comedi_device *dev, int (*i_hwdrv_CommandTestAnalogInput)(struct comedi_device *dev,
comedi_subdevice *s, comedi_subdevice *s,
comedi_cmd *cmd); comedi_cmd *cmd);
int (*i_hwdrv_CommandAnalogInput)(comedi_device *dev, int (*i_hwdrv_CommandAnalogInput)(struct comedi_device *dev,
comedi_subdevice *s); comedi_subdevice *s);
int (*i_hwdrv_CancelAnalogInput)(comedi_device *dev, int (*i_hwdrv_CancelAnalogInput)(struct comedi_device *dev,
comedi_subdevice *s); comedi_subdevice *s);
/* Analog Output */ /* Analog Output */
int (*i_hwdrv_InsnConfigAnalogOutput)(comedi_device *dev, int (*i_hwdrv_InsnConfigAnalogOutput)(struct comedi_device *dev,
comedi_subdevice *s, comedi_subdevice *s,
comedi_insn *insn, comedi_insn *insn,
unsigned int *data); unsigned int *data);
int (*i_hwdrv_InsnWriteAnalogOutput)(comedi_device *dev, int (*i_hwdrv_InsnWriteAnalogOutput)(struct comedi_device *dev,
comedi_subdevice *s, comedi_subdevice *s,
comedi_insn *insn, comedi_insn *insn,
unsigned int *data); unsigned int *data);
int (*i_hwdrv_InsnBitsAnalogOutput)(comedi_device *dev, int (*i_hwdrv_InsnBitsAnalogOutput)(struct comedi_device *dev,
comedi_subdevice *s, comedi_subdevice *s,
comedi_insn *insn, comedi_insn *insn,
unsigned int *data); unsigned int *data);
/* Digital Input */ /* Digital Input */
int (*i_hwdrv_InsnConfigDigitalInput) (comedi_device *dev, int (*i_hwdrv_InsnConfigDigitalInput) (struct comedi_device *dev,
comedi_subdevice *s, comedi_subdevice *s,
comedi_insn *insn, comedi_insn *insn,
unsigned int *data); unsigned int *data);
int (*i_hwdrv_InsnReadDigitalInput) (comedi_device *dev, int (*i_hwdrv_InsnReadDigitalInput) (struct comedi_device *dev,
comedi_subdevice *s, comedi_subdevice *s,
comedi_insn *insn, comedi_insn *insn,
unsigned int *data); unsigned int *data);
int (*i_hwdrv_InsnWriteDigitalInput) (comedi_device *dev, int (*i_hwdrv_InsnWriteDigitalInput) (struct comedi_device *dev,
comedi_subdevice *s, comedi_subdevice *s,
comedi_insn *insn, comedi_insn *insn,
unsigned int *data); unsigned int *data);
int (*i_hwdrv_InsnBitsDigitalInput) (comedi_device *dev, int (*i_hwdrv_InsnBitsDigitalInput) (struct comedi_device *dev,
comedi_subdevice *s, comedi_subdevice *s,
comedi_insn *insn, comedi_insn *insn,
unsigned int *data); unsigned int *data);
/* Digital Output */ /* Digital Output */
int (*i_hwdrv_InsnConfigDigitalOutput)(comedi_device *dev, int (*i_hwdrv_InsnConfigDigitalOutput)(struct comedi_device *dev,
comedi_subdevice *s, comedi_subdevice *s,
comedi_insn *insn, comedi_insn *insn,
unsigned int *data); unsigned int *data);
int (*i_hwdrv_InsnWriteDigitalOutput)(comedi_device *dev, int (*i_hwdrv_InsnWriteDigitalOutput)(struct comedi_device *dev,
comedi_subdevice *s, comedi_subdevice *s,
comedi_insn *insn, comedi_insn *insn,
unsigned int *data); unsigned int *data);
int (*i_hwdrv_InsnBitsDigitalOutput)(comedi_device *dev, int (*i_hwdrv_InsnBitsDigitalOutput)(struct comedi_device *dev,
comedi_subdevice *s, comedi_subdevice *s,
comedi_insn *insn, comedi_insn *insn,
unsigned int *data); unsigned int *data);
int (*i_hwdrv_InsnReadDigitalOutput)(comedi_device *dev, int (*i_hwdrv_InsnReadDigitalOutput)(struct comedi_device *dev,
comedi_subdevice *s, comedi_subdevice *s,
comedi_insn *insn, comedi_insn *insn,
unsigned int *data); unsigned int *data);
/* TIMER */ /* TIMER */
int (*i_hwdrv_InsnConfigTimer)(comedi_device *dev, int (*i_hwdrv_InsnConfigTimer)(struct comedi_device *dev,
comedi_subdevice *s, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
int (*i_hwdrv_InsnWriteTimer)(comedi_device *dev, int (*i_hwdrv_InsnWriteTimer)(struct comedi_device *dev,
comedi_subdevice *s, comedi_insn *insn, comedi_subdevice *s, comedi_insn *insn,
unsigned int *data); unsigned int *data);
int (*i_hwdrv_InsnReadTimer)(comedi_device *dev, comedi_subdevice *s, int (*i_hwdrv_InsnReadTimer)(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
int (*i_hwdrv_InsnBitsTimer)(comedi_device *dev, comedi_subdevice *s, int (*i_hwdrv_InsnBitsTimer)(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
/* TTL IO */ /* TTL IO */
int (*i_hwdr_ConfigInitTTLIO)(comedi_device *dev, int (*i_hwdr_ConfigInitTTLIO)(struct comedi_device *dev,
comedi_subdevice *s, comedi_insn *insn, comedi_subdevice *s, comedi_insn *insn,
unsigned int *data); unsigned int *data);
int (*i_hwdr_ReadTTLIOBits)(comedi_device *dev, comedi_subdevice *s, int (*i_hwdr_ReadTTLIOBits)(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
int (*i_hwdr_ReadTTLIOAllPortValue)(comedi_device *dev, int (*i_hwdr_ReadTTLIOAllPortValue)(struct comedi_device *dev,
comedi_subdevice *s, comedi_subdevice *s,
comedi_insn *insn, comedi_insn *insn,
unsigned int *data); unsigned int *data);
int (*i_hwdr_WriteTTLIOChlOnOff)(comedi_device *dev, int (*i_hwdr_WriteTTLIOChlOnOff)(struct comedi_device *dev,
comedi_subdevice *s, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
} boardtype; } boardtype;
@ -456,10 +456,10 @@ typedef struct {
static unsigned short pci_list_builded; /* set to 1 when list of card is known */ static unsigned short pci_list_builded; /* set to 1 when list of card is known */
/* Function declarations */ /* Function declarations */
static int i_ADDI_Attach(comedi_device *dev, comedi_devconfig *it); static int i_ADDI_Attach(struct comedi_device *dev, comedi_devconfig *it);
static int i_ADDI_Detach(comedi_device *dev); static int i_ADDI_Detach(struct comedi_device *dev);
static int i_ADDI_Reset(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(comedi_device *dev, comedi_subdevice *s, static int i_ADDIDATA_InsnReadEeprom(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);

8
drivers/staging/comedi/drivers/addi-data/addi_eeprom.c
View File

@ -121,7 +121,7 @@ typedef struct {
/*****************************************/ /*****************************************/
INT i_EepromReadMainHeader(WORD w_PCIBoardEepromAddress, INT i_EepromReadMainHeader(WORD w_PCIBoardEepromAddress,
PCHAR pc_PCIChipInformation, comedi_device * dev); PCHAR pc_PCIChipInformation, struct comedi_device *dev);
INT i_EepromReadDigitalInputHeader(WORD w_PCIBoardEepromAddress, INT i_EepromReadDigitalInputHeader(WORD w_PCIBoardEepromAddress,
PCHAR pc_PCIChipInformation, WORD w_Address, PCHAR pc_PCIChipInformation, WORD w_Address,
@ -787,7 +787,7 @@ VOID v_EepromCs76Read(DWORD dw_Address, WORD w_offset, PWORD pw_Value)
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : INT i_EepromReadMainHeader(WORD w_PCIBoardEepromAddress, | | Function Name : INT i_EepromReadMainHeader(WORD w_PCIBoardEepromAddress, |
| PCHAR pc_PCIChipInformation,comedi_device *dev) | | PCHAR pc_PCIChipInformation,struct comedi_device *dev) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Read from eeprom Main Header | | Task : Read from eeprom Main Header |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@ -795,7 +795,7 @@ VOID v_EepromCs76Read(DWORD dw_Address, WORD w_offset, PWORD pw_Value)
| | | |
| PCHAR pc_PCIChipInformation : PCI Chip Type. | | PCHAR pc_PCIChipInformation : PCI Chip Type. |
| | | |
| comedi_device *dev : comedi device structure | | struct comedi_device *dev : comedi device structure |
| pointer | | pointer |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Output Parameters : - | | Output Parameters : - |
@ -805,7 +805,7 @@ VOID v_EepromCs76Read(DWORD dw_Address, WORD w_offset, PWORD pw_Value)
*/ */
INT i_EepromReadMainHeader(WORD w_PCIBoardEepromAddress, INT i_EepromReadMainHeader(WORD w_PCIBoardEepromAddress,
PCHAR pc_PCIChipInformation, comedi_device * dev) PCHAR pc_PCIChipInformation, struct comedi_device *dev)
{ {
WORD w_Temp, i, w_Count = 0; WORD w_Temp, i, w_Count = 0;
UINT ui_Temp; UINT ui_Temp;

8
drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.c
View File

@ -56,7 +56,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
#include "APCI1710_Pwm.c" #include "APCI1710_Pwm.c"
#include "APCI1710_INCCPT.c" #include "APCI1710_INCCPT.c"
void i_ADDI_AttachPCI1710(comedi_device * dev) void i_ADDI_AttachPCI1710(struct comedi_device * dev)
{ {
comedi_subdevice *s; comedi_subdevice *s;
int ret = 0; int ret = 0;
@ -195,11 +195,11 @@ void i_ADDI_AttachPCI1710(comedi_device * dev)
s->insn_bits = i_APCI1710_InsnBitsINCCPT; s->insn_bits = i_APCI1710_InsnBitsINCCPT;
} }
int i_APCI1710_Reset(comedi_device * dev); int i_APCI1710_Reset(struct comedi_device * dev);
VOID v_APCI1710_Interrupt(int irq, void *d); VOID v_APCI1710_Interrupt(int irq, void *d);
//for 1710 //for 1710
int i_APCI1710_Reset(comedi_device * dev) int i_APCI1710_Reset(struct comedi_device * dev)
{ {
int ret; int ret;
DWORD dw_Dummy; DWORD dw_Dummy;
@ -249,7 +249,7 @@ int i_APCI1710_Reset(comedi_device * dev)
VOID v_APCI1710_Interrupt(int irq, void *d) VOID v_APCI1710_Interrupt(int irq, void *d)
{ {
comedi_device *dev = d; struct comedi_device *dev = d;
BYTE b_ModuleCpt = 0; BYTE b_ModuleCpt = 0;
BYTE b_InterruptFlag = 0; BYTE b_InterruptFlag = 0;
BYTE b_PWMCpt = 0; BYTE b_PWMCpt = 0;

36
drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.c
View File

@ -58,12 +58,12 @@ INT i_Flag = 1;
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI035_ConfigTimerWatchdog | | Function Name : int i_APCI035_ConfigTimerWatchdog |
| (comedi_device *dev,comedi_subdevice *s, | | (struct comedi_device *dev,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 |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| UINT *data : Data Pointer contains | | UINT *data : Data Pointer contains |
| configuration parameters as below | | configuration parameters as below |
| | | |
@ -109,7 +109,7 @@ INT i_Flag = 1;
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI035_ConfigTimerWatchdog(comedi_device * dev, comedi_subdevice * s, INT i_APCI035_ConfigTimerWatchdog(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
UINT ui_Status = 0; UINT ui_Status = 0;
@ -254,12 +254,12 @@ INT i_APCI035_ConfigTimerWatchdog(comedi_device * dev, comedi_subdevice * s,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI035_StartStopWriteTimerWatchdog | | Function Name : int i_APCI035_StartStopWriteTimerWatchdog |
| (comedi_device *dev,comedi_subdevice *s, | | (struct comedi_device *dev,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 |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| UINT *data : Data Pointer contains | | UINT *data : Data Pointer contains |
| configuration parameters as below | | configuration parameters as below |
| | | |
@ -278,7 +278,7 @@ INT i_APCI035_ConfigTimerWatchdog(comedi_device * dev, comedi_subdevice * s,
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI035_StartStopWriteTimerWatchdog(comedi_device * dev, INT i_APCI035_StartStopWriteTimerWatchdog(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
UINT ui_Command = 0; UINT ui_Command = 0;
@ -367,12 +367,12 @@ INT i_APCI035_StartStopWriteTimerWatchdog(comedi_device * dev,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI035_ReadTimerWatchdog | | Function Name : int i_APCI035_ReadTimerWatchdog |
| (comedi_device *dev,comedi_subdevice *s, | | (struct comedi_device *dev,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 |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| UINT *data : Data Pointer contains | | UINT *data : Data Pointer contains |
| configuration parameters as below | | configuration parameters as below |
| | | |
@ -391,7 +391,7 @@ INT i_APCI035_StartStopWriteTimerWatchdog(comedi_device * dev,
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI035_ReadTimerWatchdog(comedi_device * dev, comedi_subdevice * s, INT i_APCI035_ReadTimerWatchdog(struct comedi_device * dev, 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,12 +427,12 @@ INT i_APCI035_ReadTimerWatchdog(comedi_device * dev, comedi_subdevice * s,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : INT i_APCI035_ConfigAnalogInput | | Function Name : INT i_APCI035_ConfigAnalogInput |
| (comedi_device *dev,comedi_subdevice *s, | | (struct comedi_device *dev,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 : comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| comedi_subdevice *s : Subdevice Pointer | | 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 |
@ -447,7 +447,7 @@ INT i_APCI035_ReadTimerWatchdog(comedi_device * dev, comedi_subdevice * s,
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI035_ConfigAnalogInput(comedi_device * dev, comedi_subdevice * s, INT i_APCI035_ConfigAnalogInput(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
devpriv->tsk_Current = current; devpriv->tsk_Current = current;
@ -466,12 +466,12 @@ INT i_APCI035_ConfigAnalogInput(comedi_device * dev, comedi_subdevice * s,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI035_ReadAnalogInput | | Function Name : int i_APCI035_ReadAnalogInput |
| (comedi_device *dev,comedi_subdevice *s, | | (struct comedi_device *dev,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 |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| UINT ui_NoOfChannels : No Of Channels To read | | UINT ui_NoOfChannels : No Of Channels To read |
| UINT *data : Data Pointer to read status | | UINT *data : Data Pointer to read status |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@ -484,7 +484,7 @@ INT i_APCI035_ConfigAnalogInput(comedi_device * dev, comedi_subdevice * s,
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI035_ReadAnalogInput(comedi_device * dev, comedi_subdevice * s, INT i_APCI035_ReadAnalogInput(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
UINT ui_CommandRegister = 0; UINT ui_CommandRegister = 0;
@ -506,7 +506,7 @@ INT i_APCI035_ReadAnalogInput(comedi_device * dev, comedi_subdevice * s,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI035_Reset(comedi_device *dev) | | Function Name : int i_APCI035_Reset(struct comedi_device *dev) |
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task :Resets the registers of the card | | Task :Resets the registers of the card |
@ -519,7 +519,7 @@ INT i_APCI035_ReadAnalogInput(comedi_device * dev, comedi_subdevice * s,
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI035_Reset(comedi_device * dev) INT i_APCI035_Reset(struct comedi_device * dev)
{ {
INT i_Count = 0; INT i_Count = 0;
for (i_Count = 1; i_Count <= 4; i_Count++) { for (i_Count = 1; i_Count <= 4; i_Count++) {
@ -550,7 +550,7 @@ INT i_APCI035_Reset(comedi_device * dev)
*/ */
static void v_APCI035_Interrupt(int irq, void *d) static void v_APCI035_Interrupt(int irq, void *d)
{ {
comedi_device *dev = d; struct comedi_device *dev = d;
UINT ui_StatusRegister1 = 0; UINT ui_StatusRegister1 = 0;
UINT ui_StatusRegister2 = 0; UINT ui_StatusRegister2 = 0;
UINT ui_ReadCommand = 0; UINT ui_ReadCommand = 0;

12
drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.h
View File

@ -101,23 +101,23 @@ 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(comedi_device *dev, comedi_subdevice *s, INT i_APCI035_ConfigTimerWatchdog(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
INT i_APCI035_StartStopWriteTimerWatchdog(comedi_device *dev, INT i_APCI035_StartStopWriteTimerWatchdog(struct comedi_device *dev,
comedi_subdevice *s, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
INT i_APCI035_ReadTimerWatchdog(comedi_device *dev, comedi_subdevice *s, INT i_APCI035_ReadTimerWatchdog(struct comedi_device *dev, 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(comedi_device *dev, comedi_subdevice *s, INT i_APCI035_ConfigAnalogInput(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
INT i_APCI035_ReadAnalogInput(comedi_device *dev, comedi_subdevice *s, INT i_APCI035_ReadAnalogInput(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
/* Interrupt */ /* Interrupt */
static void v_APCI035_Interrupt(int irq, void *d); static void v_APCI035_Interrupt(int irq, void *d);
/* Reset functions */ /* Reset functions */
INT i_APCI035_Reset(comedi_device *dev); INT i_APCI035_Reset(struct comedi_device *dev);

26
drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c
View File

@ -59,12 +59,12 @@ UINT ui_InterruptStatus = 0;
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI1032_ConfigDigitalInput | | Function Name : int i_APCI1032_ConfigDigitalInput |
| (comedi_device *dev,comedi_subdevice *s, | | (struct comedi_device *dev,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 |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| unsigned int *data : Data Pointer contains | | unsigned int *data : Data Pointer contains |
| configuration parameters as below | | configuration parameters as below |
| | | |
@ -84,7 +84,7 @@ UINT ui_InterruptStatus = 0;
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1032_ConfigDigitalInput(comedi_device * dev, comedi_subdevice * s, INT i_APCI1032_ConfigDigitalInput(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
UINT ui_TmpValue; UINT ui_TmpValue;
@ -128,12 +128,12 @@ INT i_APCI1032_ConfigDigitalInput(comedi_device * dev, comedi_subdevice * s,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI1032_Read1DigitalInput | | Function Name : int i_APCI1032_Read1DigitalInput |
| (comedi_device *dev,comedi_subdevice *s, | | (struct comedi_device *dev,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 |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| UINT ui_Channel : Channel number to read | | UINT ui_Channel : Channel number to read |
| unsigned int *data : Data Pointer to read status | | unsigned int *data : Data Pointer to read status |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@ -144,7 +144,7 @@ INT i_APCI1032_ConfigDigitalInput(comedi_device * dev, comedi_subdevice * s,
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1032_Read1DigitalInput(comedi_device * dev, comedi_subdevice * s, INT i_APCI1032_Read1DigitalInput(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
UINT ui_TmpValue = 0; UINT ui_TmpValue = 0;
@ -166,12 +166,12 @@ INT i_APCI1032_Read1DigitalInput(comedi_device * dev, comedi_subdevice * s,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI1032_ReadMoreDigitalInput | | Function Name : int i_APCI1032_ReadMoreDigitalInput |
| (comedi_device *dev,comedi_subdevice *s, | | (struct comedi_device *dev,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 |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| UINT ui_NoOfChannels : No Of Channels To be Read | | UINT ui_NoOfChannels : No Of Channels To be Read |
| UINT *data : Data Pointer to read status | | UINT *data : Data Pointer to read status |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@ -183,7 +183,7 @@ INT i_APCI1032_Read1DigitalInput(comedi_device * dev, comedi_subdevice * s,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1032_ReadMoreDigitalInput(comedi_device * dev, comedi_subdevice * s, INT i_APCI1032_ReadMoreDigitalInput(struct comedi_device * dev, 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];
@ -245,7 +245,7 @@ INT i_APCI1032_ReadMoreDigitalInput(comedi_device * dev, comedi_subdevice * s,
*/ */
static VOID v_APCI1032_Interrupt(int irq, void *d) static VOID v_APCI1032_Interrupt(int irq, void *d)
{ {
comedi_device *dev = d; struct comedi_device *dev = d;
UINT ui_Temp; UINT ui_Temp;
//disable the interrupt //disable the interrupt
@ -262,11 +262,11 @@ static VOID v_APCI1032_Interrupt(int irq, void *d)
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI1032_Reset(comedi_device *dev) | | | Function Name : int i_APCI1032_Reset(struct comedi_device *dev) | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task :resets all the registers | | Task :resets all the registers |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev | Input Parameters : struct comedi_device *dev
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Output Parameters : -- | | Output Parameters : -- |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@ -275,7 +275,7 @@ static VOID v_APCI1032_Interrupt(int irq, void *d)
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1032_Reset(comedi_device * dev) INT i_APCI1032_Reset(struct comedi_device * dev)
{ {
outl(0x0, devpriv->iobase + APCI1032_DIGITAL_IP_IRQ); //disable the interrupts outl(0x0, devpriv->iobase + APCI1032_DIGITAL_IP_IRQ); //disable the interrupts
inl(devpriv->iobase + APCI1032_DIGITAL_IP_INTERRUPT_STATUS); //Reset the interrupt status register inl(devpriv->iobase + APCI1032_DIGITAL_IP_INTERRUPT_STATUS); //Reset the interrupt status register

8
drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.h
View File

@ -47,17 +47,17 @@
//DI //DI
// for di read // for di read
INT i_APCI1032_ConfigDigitalInput(comedi_device *dev, comedi_subdevice *s, INT i_APCI1032_ConfigDigitalInput(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
INT i_APCI1032_Read1DigitalInput(comedi_device *dev, comedi_subdevice *s, INT i_APCI1032_Read1DigitalInput(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
INT i_APCI1032_ReadMoreDigitalInput(comedi_device *dev, comedi_subdevice *s, INT i_APCI1032_ReadMoreDigitalInput(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
// Interrupt functions..... // Interrupt functions.....
static VOID v_APCI1032_Interrupt(int irq, void *d); static VOID v_APCI1032_Interrupt(int irq, void *d);
//Reset //Reset
INT i_APCI1032_Reset(comedi_device *dev); INT i_APCI1032_Reset(struct comedi_device *dev);

72
drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c
View File

@ -61,7 +61,7 @@ int i_TimerCounter1Enabled = 0, i_TimerCounter2Enabled =
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI1500_ConfigDigitalInputEvent | | Function Name : int i_APCI1500_ConfigDigitalInputEvent |
| (comedi_device *dev,comedi_subdevice *s, | | (struct comedi_device *dev,comedi_subdevice *s, |
| comedi_insn *insn,unsigned int *data) | | comedi_insn *insn,unsigned int *data) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : An event can be generated for each port. | | Task : An event can be generated for each port. |
@ -70,7 +70,7 @@ int i_TimerCounter1Enabled = 0, i_TimerCounter2Enabled =
| (port 2). An interrupt is generated when one or both | | (port 2). An interrupt is generated when one or both |
| events have occurred | | events have occurred |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| unsigned int *data : Data Pointer contains | | unsigned int *data : Data Pointer contains |
| configuration parameters as below | | configuration parameters as below |
| | | |
@ -137,7 +137,7 @@ int i_TimerCounter1Enabled = 0, i_TimerCounter2Enabled =
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1500_ConfigDigitalInputEvent(comedi_device * dev, INT i_APCI1500_ConfigDigitalInputEvent(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
int i_PatternPolarity = 0, i_PatternTransition = 0, i_PatternMask = 0; int i_PatternPolarity = 0, i_PatternTransition = 0, i_PatternMask = 0;
@ -500,12 +500,12 @@ INT i_APCI1500_ConfigDigitalInputEvent(comedi_device * dev,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI1500_StartStopInputEvent | | Function Name : int i_APCI1500_StartStopInputEvent |
| (comedi_device *dev,comedi_subdevice *s, | | (struct comedi_device *dev,comedi_subdevice *s, |
| comedi_insn *insn,unsigned int *data) | | comedi_insn *insn,unsigned int *data) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Allows or disallows a port event | | Task : Allows or disallows a port event |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| UINT ui_Channel : Channel number to read | | UINT ui_Channel : Channel number to read |
| unsigned int *data : Data Pointer to read status | | unsigned int *data : Data Pointer to read status |
data[0] :0 Start input event data[0] :0 Start input event
@ -519,7 +519,7 @@ INT i_APCI1500_ConfigDigitalInputEvent(comedi_device * dev,
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI1500_StartStopInputEvent(comedi_device * dev, comedi_subdevice * s, int i_APCI1500_StartStopInputEvent(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
int i_Event1InterruptStatus = 0, i_Event2InterruptStatus = int i_Event1InterruptStatus = 0, i_Event2InterruptStatus =
@ -768,12 +768,12 @@ int i_APCI1500_StartStopInputEvent(comedi_device * dev, comedi_subdevice * s,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI1500_Initialisation | | Function Name : int i_APCI1500_Initialisation |
| (comedi_device *dev,comedi_subdevice *s, | | (struct comedi_device *dev,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 |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| UINT ui_Channel : Channel number to read | | UINT ui_Channel : Channel number to read |
| unsigned int *data : Data Pointer to read status | | unsigned int *data : Data Pointer to read status |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@ -784,7 +784,7 @@ int i_APCI1500_StartStopInputEvent(comedi_device * dev, comedi_subdevice * s,
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1500_Initialisation(comedi_device * dev, comedi_subdevice * s, INT i_APCI1500_Initialisation(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
int i_DummyRead = 0; int i_DummyRead = 0;
@ -937,12 +937,12 @@ INT i_APCI1500_Initialisation(comedi_device * dev, comedi_subdevice * s,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI1500_ReadMoreDigitalInput | | Function Name : int i_APCI1500_ReadMoreDigitalInput |
| (comedi_device *dev,comedi_subdevice *s, | | (struct comedi_device *dev,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 |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| UINT ui_NoOfChannels : No Of Channels To be Read | | UINT ui_NoOfChannels : No Of Channels To be Read |
| UINT *data : Data Pointer | UINT *data : Data Pointer
data[0] : 0 Read a single channel data[0] : 0 Read a single channel
@ -957,7 +957,7 @@ INT i_APCI1500_Initialisation(comedi_device * dev, comedi_subdevice * s,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1500_ReadMoreDigitalInput(comedi_device * dev, comedi_subdevice * s, INT i_APCI1500_ReadMoreDigitalInput(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
UINT ui_PortValue = data[1]; UINT ui_PortValue = data[1];
@ -1015,14 +1015,14 @@ INT i_APCI1500_ReadMoreDigitalInput(comedi_device * dev, comedi_subdevice * s,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI1500_ConfigDigitalOutputErrorInterrupt | Function Name : int i_APCI1500_ConfigDigitalOutputErrorInterrupt
(comedi_device *dev,comedi_subdevice *s comedi_insn (struct comedi_device *dev,comedi_subdevice *s comedi_insn
*insn,unsigned int *data) | *insn,unsigned int *data) |
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Configures the digital output memory and the digital | Task : Configures the digital output memory and the digital
output error interrupt | output error interrupt |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| unsigned int *data : Data Pointer contains | | unsigned int *data : Data Pointer contains |
| configuration parameters as below | | configuration parameters as below |
| comedi_subdevice *s, :pointer to subdevice structure | comedi_subdevice *s, :pointer to subdevice structure
@ -1040,7 +1040,7 @@ INT i_APCI1500_ReadMoreDigitalInput(comedi_device * dev, comedi_subdevice * s,
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI1500_ConfigDigitalOutputErrorInterrupt(comedi_device * dev, int i_APCI1500_ConfigDigitalOutputErrorInterrupt(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
devpriv->b_OutputMemoryStatus = data[0]; devpriv->b_OutputMemoryStatus = data[0];
@ -1050,12 +1050,12 @@ int i_APCI1500_ConfigDigitalOutputErrorInterrupt(comedi_device * dev,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI1500_WriteDigitalOutput | | Function Name : int i_APCI1500_WriteDigitalOutput |
| (comedi_device *dev,comedi_subdevice *s, | | (struct comedi_device *dev,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 |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| UINT ui_NoOfChannels : No Of Channels To Write | | UINT ui_NoOfChannels : No Of Channels To Write |
| UINT *data : Data Pointer to read status | | UINT *data : Data Pointer to read status |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@ -1067,7 +1067,7 @@ int i_APCI1500_ConfigDigitalOutputErrorInterrupt(comedi_device * dev,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1500_WriteDigitalOutput(comedi_device * dev, comedi_subdevice * s, INT i_APCI1500_WriteDigitalOutput(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
static UINT ui_Temp = 0; static UINT ui_Temp = 0;
@ -1220,7 +1220,7 @@ INT i_APCI1500_WriteDigitalOutput(comedi_device * dev, comedi_subdevice * s,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Configures The Watchdog | | Task : Configures The Watchdog |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| comedi_subdevice *s, :pointer to subdevice structure | 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 data[0] : 2 APCI1500_1_8_KHZ | unsigned int *data : Data Pointer to read status data[0] : 2 APCI1500_1_8_KHZ
@ -1261,7 +1261,7 @@ INT i_APCI1500_WriteDigitalOutput(comedi_device * dev, comedi_subdevice * s,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI1500_ConfigCounterTimerWatchdog(comedi_device * dev, int i_APCI1500_ConfigCounterTimerWatchdog(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
int i_TimerCounterMode, i_MasterConfiguration; int i_TimerCounterMode, i_MasterConfiguration;
@ -1835,12 +1835,12 @@ int i_APCI1500_ConfigCounterTimerWatchdog(comedi_device * dev,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI1500_StartStopTriggerTimerCounterWatchdog | | Function Name : int i_APCI1500_StartStopTriggerTimerCounterWatchdog |
| (comedi_device *dev,comedi_subdevice *s, | (struct comedi_device *dev,comedi_subdevice *s,
comedi_insn *insn,unsigned int *data); | comedi_insn *insn,unsigned int *data); |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Start / Stop or trigger the timer counter or Watchdog | | Task : Start / Stop or trigger the timer counter or Watchdog |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| comedi_subdevice *s, :pointer to subdevice structure | 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 |
@ -1860,7 +1860,7 @@ int i_APCI1500_ConfigCounterTimerWatchdog(comedi_device * dev,
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI1500_StartStopTriggerTimerCounterWatchdog(comedi_device * dev, int i_APCI1500_StartStopTriggerTimerCounterWatchdog(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
int i_CommandAndStatusValue; int i_CommandAndStatusValue;
@ -2160,12 +2160,12 @@ int i_APCI1500_StartStopTriggerTimerCounterWatchdog(comedi_device * dev,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI1500_ReadCounterTimerWatchdog | | Function Name : int i_APCI1500_ReadCounterTimerWatchdog |
| (comedi_device *dev,comedi_subdevice *s,comedi_insn *insn, | (struct comedi_device *dev,comedi_subdevice *s,comedi_insn *insn,
unsigned int *data); | unsigned int *data); |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Read The Watchdog | | Task : Read The Watchdog |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| comedi_subdevice *s, :pointer to subdevice structure | 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 |
@ -2182,7 +2182,7 @@ int i_APCI1500_StartStopTriggerTimerCounterWatchdog(comedi_device * dev,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI1500_ReadCounterTimerWatchdog(comedi_device * dev, int i_APCI1500_ReadCounterTimerWatchdog(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
int i_CommandAndStatusValue; int i_CommandAndStatusValue;
@ -2351,12 +2351,12 @@ int i_APCI1500_ReadCounterTimerWatchdog(comedi_device * dev,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI1500_ReadInterruptMask | | Function Name : int i_APCI1500_ReadInterruptMask |
| (comedi_device *dev,comedi_subdevice *s,comedi_insn *insn, | (struct comedi_device *dev,comedi_subdevice *s,comedi_insn *insn,
unsigned int *data); | unsigned int *data); |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Read the interrupt mask | | Task : Read the interrupt mask |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| comedi_subdevice *s, :pointer to subdevice structure | 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 |
@ -2370,7 +2370,7 @@ int i_APCI1500_ReadCounterTimerWatchdog(comedi_device * dev,
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI1500_ReadInterruptMask(comedi_device * dev, comedi_subdevice * s, int i_APCI1500_ReadInterruptMask(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
data[0] = i_InterruptMask; data[0] = i_InterruptMask;
@ -2382,12 +2382,12 @@ int i_APCI1500_ReadInterruptMask(comedi_device * dev, comedi_subdevice * s,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI1500_ConfigureInterrupt | | Function Name : int i_APCI1500_ConfigureInterrupt |
| (comedi_device *dev,comedi_subdevice *s,comedi_insn *insn, | (struct comedi_device *dev,comedi_subdevice *s,comedi_insn *insn,
unsigned int *data); | unsigned int *data); |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Configures the interrupt registers | | Task : Configures the interrupt registers |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| comedi_subdevice *s, :pointer to subdevice structure | 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 | | unsigned int *data : Data Pointer |
@ -2401,7 +2401,7 @@ int i_APCI1500_ReadInterruptMask(comedi_device * dev, comedi_subdevice * s,
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI1500_ConfigureInterrupt(comedi_device * dev, comedi_subdevice * s, int i_APCI1500_ConfigureInterrupt(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
UINT ui_Status; UINT ui_Status;
@ -2579,7 +2579,7 @@ int i_APCI1500_ConfigureInterrupt(comedi_device * dev, comedi_subdevice * s,
static VOID v_APCI1500_Interrupt(int irq, void *d) static VOID v_APCI1500_Interrupt(int irq, void *d)
{ {
comedi_device *dev = d; struct comedi_device *dev = d;
UINT ui_InterruptStatus = 0; UINT ui_InterruptStatus = 0;
int i_RegValue = 0; int i_RegValue = 0;
i_InterruptMask = 0; i_InterruptMask = 0;
@ -2809,11 +2809,11 @@ static VOID v_APCI1500_Interrupt(int irq, void *d)
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI1500_Reset(comedi_device *dev) | | | Function Name : int i_APCI1500_Reset(struct comedi_device *dev) | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task :resets all the registers | | Task :resets all the registers |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev | Input Parameters : struct comedi_device *dev
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Output Parameters : -- | | Output Parameters : -- |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@ -2822,7 +2822,7 @@ static VOID v_APCI1500_Interrupt(int irq, void *d)
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1500_Reset(comedi_device * dev) INT i_APCI1500_Reset(struct comedi_device * dev)
{ {
int i_DummyRead = 0; int i_DummyRead = 0;
i_TimerCounter1Init = 0; i_TimerCounter1Init = 0;

24
drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.h
View File

@ -116,50 +116,50 @@ enum {
}; };
/*----------DIGITAL INPUT----------------*/ /*----------DIGITAL INPUT----------------*/
static int i_APCI1500_Initialisation(comedi_device *dev, comedi_subdevice *s, static int i_APCI1500_Initialisation(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
static int i_APCI1500_ConfigDigitalInputEvent(comedi_device *dev, static int i_APCI1500_ConfigDigitalInputEvent(struct comedi_device *dev,
comedi_subdevice *s, comedi_subdevice *s,
comedi_insn *insn, comedi_insn *insn,
unsigned int *data); unsigned int *data);
static int i_APCI1500_StartStopInputEvent(comedi_device *dev, static int i_APCI1500_StartStopInputEvent(struct comedi_device *dev,
comedi_subdevice *s, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
static int i_APCI1500_ReadMoreDigitalInput(comedi_device *dev, static int i_APCI1500_ReadMoreDigitalInput(struct comedi_device *dev,
comedi_subdevice *s, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
/*---------- DIGITAL OUTPUT------------*/ /*---------- DIGITAL OUTPUT------------*/
static int i_APCI1500_ConfigDigitalOutputErrorInterrupt(comedi_device *dev, static int i_APCI1500_ConfigDigitalOutputErrorInterrupt(struct comedi_device *dev,
comedi_subdevice *s, comedi_subdevice *s,
comedi_insn *insn, comedi_insn *insn,
unsigned int *data); unsigned int *data);
static int i_APCI1500_WriteDigitalOutput(comedi_device *dev, static int i_APCI1500_WriteDigitalOutput(struct comedi_device *dev,
comedi_subdevice *s, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
/*----------TIMER----------------*/ /*----------TIMER----------------*/
static int i_APCI1500_ConfigCounterTimerWatchdog(comedi_device *dev, static int i_APCI1500_ConfigCounterTimerWatchdog(struct comedi_device *dev,
comedi_subdevice *s, comedi_subdevice *s,
comedi_insn *insn, comedi_insn *insn,
unsigned int *data); unsigned int *data);
static int i_APCI1500_StartStopTriggerTimerCounterWatchdog(comedi_device *dev, static int i_APCI1500_StartStopTriggerTimerCounterWatchdog(struct comedi_device *dev,
comedi_subdevice *s, comedi_subdevice *s,
comedi_insn *insn, comedi_insn *insn,
unsigned int *data); unsigned int *data);
static int i_APCI1500_ReadCounterTimerWatchdog(comedi_device *dev, static int i_APCI1500_ReadCounterTimerWatchdog(struct comedi_device *dev,
comedi_subdevice *s, comedi_subdevice *s,
comedi_insn *insn, comedi_insn *insn,
unsigned int *data); unsigned int *data);
static int i_APCI1500_ReadInterruptMask(comedi_device *dev, static int i_APCI1500_ReadInterruptMask(struct comedi_device *dev,
comedi_subdevice *s, 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(comedi_device *dev, static int i_APCI1500_ConfigureInterrupt(struct comedi_device *dev,
comedi_subdevice *s, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
/*----------RESET---------------*/ /*----------RESET---------------*/
static int i_APCI1500_Reset(comedi_device *dev); static int i_APCI1500_Reset(struct comedi_device *dev);

54
drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.c
View File

@ -56,12 +56,12 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI1516_Read1DigitalInput | | Function Name : int i_APCI1516_Read1DigitalInput |
| (comedi_device *dev,comedi_subdevice *s, | | (struct comedi_device *dev,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 |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| comedi_subdevice *s, :pointer to subdevice structure | 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 |
@ -73,7 +73,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1516_Read1DigitalInput(comedi_device * dev, comedi_subdevice * s, INT i_APCI1516_Read1DigitalInput(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
UINT ui_TmpValue = 0; UINT ui_TmpValue = 0;
@ -96,12 +96,12 @@ INT i_APCI1516_Read1DigitalInput(comedi_device * dev, comedi_subdevice * s,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI1516_ReadMoreDigitalInput | | Function Name : int i_APCI1516_ReadMoreDigitalInput |
| (comedi_device *dev,comedi_subdevice *s, | | (struct comedi_device *dev,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 |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| comedi_subdevice *s, :pointer to subdevice structure | 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 |
@ -114,7 +114,7 @@ INT i_APCI1516_Read1DigitalInput(comedi_device * dev, comedi_subdevice * s,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1516_ReadMoreDigitalInput(comedi_device * dev, comedi_subdevice * s, INT i_APCI1516_ReadMoreDigitalInput(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
@ -148,13 +148,13 @@ INT i_APCI1516_ReadMoreDigitalInput(comedi_device * dev, comedi_subdevice * s,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI1516_ConfigDigitalOutput (comedi_device *dev, | Function Name : int i_APCI1516_ConfigDigitalOutput (struct comedi_device *dev,
comedi_subdevice *s comedi_insn *insn,unsigned int *data) | comedi_subdevice *s comedi_insn *insn,unsigned int *data) |
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Configures The Digital Output Subdevice. | | Task : Configures The Digital Output Subdevice. |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| unsigned int *data : Data Pointer contains | | unsigned int *data : Data Pointer contains |
| configuration parameters as below | | configuration parameters as below |
| comedi_subdevice *s, :pointer to subdevice structure | comedi_subdevice *s, :pointer to subdevice structure
@ -171,7 +171,7 @@ INT i_APCI1516_ReadMoreDigitalInput(comedi_device * dev, comedi_subdevice * s,
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI1516_ConfigDigitalOutput(comedi_device * dev, comedi_subdevice * s, int i_APCI1516_ConfigDigitalOutput(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
devpriv->b_OutputMemoryStatus = data[0]; devpriv->b_OutputMemoryStatus = data[0];
@ -181,12 +181,12 @@ int i_APCI1516_ConfigDigitalOutput(comedi_device * dev, comedi_subdevice * s,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI1516_WriteDigitalOutput | | Function Name : int i_APCI1516_WriteDigitalOutput |
| (comedi_device *dev,comedi_subdevice *s,comedi_insn *insn, | (struct comedi_device *dev,comedi_subdevice *s,comedi_insn *insn,
unsigned int *data) | unsigned int *data) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Writes port value To the selected port | | Task : Writes port value To the selected port |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| comedi_subdevice *s, :pointer to subdevice structure | 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 |
@ -199,7 +199,7 @@ int i_APCI1516_ConfigDigitalOutput(comedi_device * dev, comedi_subdevice * s,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1516_WriteDigitalOutput(comedi_device * dev, comedi_subdevice * s, INT i_APCI1516_WriteDigitalOutput(struct comedi_device * dev, 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;
@ -341,12 +341,12 @@ INT i_APCI1516_WriteDigitalOutput(comedi_device * dev, comedi_subdevice * s,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI1516_ReadDigitalOutput | | Function Name : int i_APCI1516_ReadDigitalOutput |
| (comedi_device *dev,comedi_subdevice *s,comedi_insn *insn, | (struct comedi_device *dev,comedi_subdevice *s,comedi_insn *insn,
unsigned int *data) | unsigned int *data) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Read value of the selected channel or port | | Task : Read value of the selected channel or port |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| comedi_subdevice *s, :pointer to subdevice structure | 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 |
@ -359,7 +359,7 @@ INT i_APCI1516_WriteDigitalOutput(comedi_device * dev, comedi_subdevice * s,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1516_ReadDigitalOutput(comedi_device * dev, comedi_subdevice * s, INT i_APCI1516_ReadDigitalOutput(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
@ -400,13 +400,13 @@ INT i_APCI1516_ReadDigitalOutput(comedi_device * dev, comedi_subdevice * s,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI1516_ConfigWatchdog(comedi_device *dev, | Function Name : int i_APCI1516_ConfigWatchdog(struct comedi_device *dev,
comedi_subdevice *s,comedi_insn *insn,unsigned int *data) | comedi_subdevice *s,comedi_insn *insn,unsigned int *data) |
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Configures The Watchdog | | Task : Configures The Watchdog |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| comedi_subdevice *s, :pointer to subdevice structure | 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 |
@ -419,7 +419,7 @@ INT i_APCI1516_ReadDigitalOutput(comedi_device * dev, comedi_subdevice * s,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI1516_ConfigWatchdog(comedi_device * dev, comedi_subdevice * s, int i_APCI1516_ConfigWatchdog(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
if (data[0] == 0) { if (data[0] == 0) {
@ -447,12 +447,12 @@ int i_APCI1516_ConfigWatchdog(comedi_device * dev, comedi_subdevice * s,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI1516_StartStopWriteWatchdog | | Function Name : int i_APCI1516_StartStopWriteWatchdog |
| (comedi_device *dev,comedi_subdevice *s, | (struct comedi_device *dev,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 : comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| comedi_subdevice *s, :pointer to subdevice structure | 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 |
@ -465,7 +465,7 @@ int i_APCI1516_ConfigWatchdog(comedi_device * dev, comedi_subdevice * s,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI1516_StartStopWriteWatchdog(comedi_device * dev, comedi_subdevice * s, int i_APCI1516_StartStopWriteWatchdog(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
switch (data[0]) { switch (data[0]) {
@ -492,12 +492,12 @@ int i_APCI1516_StartStopWriteWatchdog(comedi_device * dev, comedi_subdevice * s,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI1516_ReadWatchdog | | Function Name : int i_APCI1516_ReadWatchdog |
| (comedi_device *dev,comedi_subdevice *s,comedi_insn *insn, | (struct comedi_device *dev,comedi_subdevice *s,comedi_insn *insn,
unsigned int *data); | unsigned int *data); |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Read The Watchdog | | Task : Read The Watchdog |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| comedi_subdevice *s, :pointer to subdevice structure | 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 |
@ -510,7 +510,7 @@ int i_APCI1516_StartStopWriteWatchdog(comedi_device * dev, comedi_subdevice * s,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI1516_ReadWatchdog(comedi_device * dev, comedi_subdevice * s, int i_APCI1516_ReadWatchdog(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
data[0] = inw(devpriv->i_IobaseAddon + APCI1516_WATCHDOG_STATUS) & 0x1; data[0] = inw(devpriv->i_IobaseAddon + APCI1516_WATCHDOG_STATUS) & 0x1;
@ -519,11 +519,11 @@ int i_APCI1516_ReadWatchdog(comedi_device * dev, comedi_subdevice * s,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI1516_Reset(comedi_device *dev) | | | Function Name : int i_APCI1516_Reset(struct comedi_device *dev) | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task :resets all the registers | | Task :resets all the registers |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev | Input Parameters : struct comedi_device *dev
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Output Parameters : -- | | Output Parameters : -- |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@ -532,7 +532,7 @@ int i_APCI1516_ReadWatchdog(comedi_device * dev, comedi_subdevice * s,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1516_Reset(comedi_device * dev) INT i_APCI1516_Reset(struct comedi_device * dev)
{ {
outw(0x0, devpriv->iobase + APCI1516_DIGITAL_OP); //RESETS THE DIGITAL OUTPUTS outw(0x0, devpriv->iobase + APCI1516_DIGITAL_OP); //RESETS THE DIGITAL OUTPUTS
outw(0x0, devpriv->i_IobaseAddon + APCI1516_WATCHDOG_ENABLEDISABLE); outw(0x0, devpriv->i_IobaseAddon + APCI1516_WATCHDOG_ENABLEDISABLE);

18
drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.h
View File

@ -38,27 +38,27 @@
// Hardware Layer functions for Apci1516 // Hardware Layer functions for Apci1516
//Digital Input //Digital Input
INT i_APCI1516_ReadMoreDigitalInput(comedi_device *dev, comedi_subdevice *s, INT i_APCI1516_ReadMoreDigitalInput(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
INT i_APCI1516_Read1DigitalInput(comedi_device *dev, comedi_subdevice *s, INT i_APCI1516_Read1DigitalInput(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
//Digital Output //Digital Output
int i_APCI1516_ConfigDigitalOutput(comedi_device *dev, comedi_subdevice *s, int i_APCI1516_ConfigDigitalOutput(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
INT i_APCI1516_WriteDigitalOutput(comedi_device *dev, comedi_subdevice *s, INT i_APCI1516_WriteDigitalOutput(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
INT i_APCI1516_ReadDigitalOutput(comedi_device *dev, comedi_subdevice *s, INT i_APCI1516_ReadDigitalOutput(struct comedi_device *dev, 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(comedi_device *dev, comedi_subdevice *s, int i_APCI1516_ConfigWatchdog(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
int i_APCI1516_StartStopWriteWatchdog(comedi_device *dev, comedi_subdevice *s, int i_APCI1516_StartStopWriteWatchdog(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
int i_APCI1516_ReadWatchdog(comedi_device *dev, comedi_subdevice *s, int i_APCI1516_ReadWatchdog(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
//reset //reset
INT i_APCI1516_Reset(comedi_device *dev); INT i_APCI1516_Reset(struct comedi_device *dev);

66
drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c
View File

@ -62,12 +62,12 @@ UINT ui_InterruptData, ui_Type;
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI1564_ConfigDigitalInput | | Function Name : int i_APCI1564_ConfigDigitalInput |
| (comedi_device *dev,comedi_subdevice *s, | | (struct comedi_device *dev,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 |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| unsigned int *data : Data Pointer contains | | unsigned int *data : Data Pointer contains |
| configuration parameters as below | | configuration parameters as below |
| | | |
@ -86,7 +86,7 @@ UINT ui_InterruptData, ui_Type;
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1564_ConfigDigitalInput(comedi_device * dev, comedi_subdevice * s, INT i_APCI1564_ConfigDigitalInput(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
devpriv->tsk_Current = current; devpriv->tsk_Current = current;
@ -131,12 +131,12 @@ INT i_APCI1564_ConfigDigitalInput(comedi_device * dev, comedi_subdevice * s,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI1564_Read1DigitalInput | | Function Name : int i_APCI1564_Read1DigitalInput |
| (comedi_device *dev,comedi_subdevice *s, | | (struct comedi_device *dev,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 |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| UINT ui_Channel : Channel number to read | | UINT ui_Channel : Channel number to read |
| unsigned int *data : Data Pointer to read status | | unsigned int *data : Data Pointer to read status |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@ -147,7 +147,7 @@ INT i_APCI1564_ConfigDigitalInput(comedi_device * dev, comedi_subdevice * s,
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1564_Read1DigitalInput(comedi_device * dev, comedi_subdevice * s, INT i_APCI1564_Read1DigitalInput(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
UINT ui_TmpValue = 0; UINT ui_TmpValue = 0;
@ -171,12 +171,12 @@ INT i_APCI1564_Read1DigitalInput(comedi_device * dev, comedi_subdevice * s,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI1564_ReadMoreDigitalInput | | Function Name : int i_APCI1564_ReadMoreDigitalInput |
| (comedi_device *dev,comedi_subdevice *s, | | (struct comedi_device *dev,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 |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| UINT ui_NoOfChannels : No Of Channels To be Read | | UINT ui_NoOfChannels : No Of Channels To be Read |
| UINT *data : Data Pointer to read status | | UINT *data : Data Pointer to read status |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@ -187,7 +187,7 @@ INT i_APCI1564_Read1DigitalInput(comedi_device * dev, comedi_subdevice * s,
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1564_ReadMoreDigitalInput(comedi_device * dev, comedi_subdevice * s, INT i_APCI1564_ReadMoreDigitalInput(struct comedi_device * dev, 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];
@ -233,12 +233,12 @@ INT i_APCI1564_ReadMoreDigitalInput(comedi_device * dev, comedi_subdevice * s,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI1564_ConfigDigitalOutput | | Function Name : int i_APCI1564_ConfigDigitalOutput |
| (comedi_device *dev,comedi_subdevice *s, | | (struct comedi_device *dev,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. |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| UINT *data : Data Pointer contains | | UINT *data : Data Pointer contains |
| configuration parameters as below | | configuration parameters as below |
| | | |
@ -255,7 +255,7 @@ INT i_APCI1564_ReadMoreDigitalInput(comedi_device * dev, comedi_subdevice * s,
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1564_ConfigDigitalOutput(comedi_device * dev, comedi_subdevice * s, INT i_APCI1564_ConfigDigitalOutput(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
ULONG ul_Command = 0; ULONG ul_Command = 0;
@ -296,12 +296,12 @@ INT i_APCI1564_ConfigDigitalOutput(comedi_device * dev, comedi_subdevice * s,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI1564_WriteDigitalOutput | | Function Name : int i_APCI1564_WriteDigitalOutput |
| (comedi_device *dev,comedi_subdevice *s, | | (struct comedi_device *dev,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 |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| UINT ui_NoOfChannels : No Of Channels To Write | | UINT ui_NoOfChannels : No Of Channels To Write |
| UINT *data : Data Pointer to read status | | UINT *data : Data Pointer to read status |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@ -312,7 +312,7 @@ INT i_APCI1564_ConfigDigitalOutput(comedi_device * dev, comedi_subdevice * s,
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1564_WriteDigitalOutput(comedi_device * dev, comedi_subdevice * s, INT i_APCI1564_WriteDigitalOutput(struct comedi_device * dev, 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;
@ -470,12 +470,12 @@ INT i_APCI1564_WriteDigitalOutput(comedi_device * dev, comedi_subdevice * s,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI1564_ReadDigitalOutput | | Function Name : int i_APCI1564_ReadDigitalOutput |
| (comedi_device *dev,comedi_subdevice *s, | | (struct comedi_device *dev,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 |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| UINT ui_NoOfChannels : No Of Channels To read | | UINT ui_NoOfChannels : No Of Channels To read |
| UINT *data : Data Pointer to read status | | UINT *data : Data Pointer to read status |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@ -486,7 +486,7 @@ INT i_APCI1564_WriteDigitalOutput(comedi_device * dev, comedi_subdevice * s,
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1564_ReadDigitalOutput(comedi_device * dev, comedi_subdevice * s, INT i_APCI1564_ReadDigitalOutput(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
UINT ui_Temp; UINT ui_Temp;
@ -537,12 +537,12 @@ INT i_APCI1564_ReadDigitalOutput(comedi_device * dev, comedi_subdevice * s,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI1564_ConfigTimerCounterWatchdog | | Function Name : int i_APCI1564_ConfigTimerCounterWatchdog |
| (comedi_device *dev,comedi_subdevice *s, | | (struct comedi_device *dev,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 |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| UINT *data : Data Pointer contains | | UINT *data : Data Pointer contains |
| configuration parameters as below | | configuration parameters as below |
| | | |
@ -564,7 +564,7 @@ INT i_APCI1564_ReadDigitalOutput(comedi_device * dev, comedi_subdevice * s,
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1564_ConfigTimerCounterWatchdog(comedi_device * dev, INT i_APCI1564_ConfigTimerCounterWatchdog(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
ULONG ul_Command1 = 0; ULONG ul_Command1 = 0;
@ -695,12 +695,12 @@ INT i_APCI1564_ConfigTimerCounterWatchdog(comedi_device * dev,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI1564_StartStopWriteTimerCounterWatchdog | | Function Name : int i_APCI1564_StartStopWriteTimerCounterWatchdog |
| (comedi_device *dev,comedi_subdevice *s, | | (struct comedi_device *dev,comedi_subdevice *s, |
| comedi_insn *insn,unsigned int *data) | | comedi_insn *insn,unsigned int *data) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Start / Stop The Selected Timer , Counter or Watchdog | | Task : Start / Stop The Selected Timer , Counter or Watchdog |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| UINT *data : Data Pointer contains | | UINT *data : Data Pointer contains |
| configuration parameters as below | | configuration parameters as below |
| | | |
@ -718,7 +718,7 @@ INT i_APCI1564_ConfigTimerCounterWatchdog(comedi_device * dev,
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1564_StartStopWriteTimerCounterWatchdog(comedi_device * dev, INT i_APCI1564_StartStopWriteTimerCounterWatchdog(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
ULONG ul_Command1 = 0; ULONG ul_Command1 = 0;
@ -795,12 +795,12 @@ INT i_APCI1564_StartStopWriteTimerCounterWatchdog(comedi_device * dev,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI1564_ReadTimerCounterWatchdog | | Function Name : int i_APCI1564_ReadTimerCounterWatchdog |
| (comedi_device *dev,comedi_subdevice *s, | | (struct comedi_device *dev,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 |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| UINT *data : Data Pointer contains | | UINT *data : Data Pointer contains |
| configuration parameters as below | | configuration parameters as below |
| | | |
@ -813,7 +813,7 @@ INT i_APCI1564_StartStopWriteTimerCounterWatchdog(comedi_device * dev,
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1564_ReadTimerCounterWatchdog(comedi_device * dev, INT i_APCI1564_ReadTimerCounterWatchdog(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
ULONG ul_Command1 = 0; ULONG ul_Command1 = 0;
@ -878,7 +878,7 @@ INT i_APCI1564_ReadTimerCounterWatchdog(comedi_device * dev,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI1564_ReadInterruptStatus | | Function Name : int i_APCI1564_ReadInterruptStatus |
| (comedi_device *dev,comedi_subdevice *s, | | (struct comedi_device *dev,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 |
@ -892,7 +892,7 @@ INT i_APCI1564_ReadTimerCounterWatchdog(comedi_device * dev,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI1564_ReadInterruptStatus(comedi_device * dev, comedi_subdevice * s, int i_APCI1564_ReadInterruptStatus(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
*data = ui_Type; *data = ui_Type;
@ -918,7 +918,7 @@ int i_APCI1564_ReadInterruptStatus(comedi_device * dev, comedi_subdevice * s,
*/ */
static VOID v_APCI1564_Interrupt(int irq, void *d) static VOID v_APCI1564_Interrupt(int irq, void *d)
{ {
comedi_device *dev = d; struct comedi_device *dev = d;
UINT ui_DO, ui_DI; UINT ui_DO, ui_DI;
UINT ui_Timer; UINT ui_Timer;
UINT ui_C1, ui_C2, ui_C3, ui_C4; UINT ui_C1, ui_C2, ui_C3, ui_C4;
@ -1068,11 +1068,11 @@ static VOID v_APCI1564_Interrupt(int irq, void *d)
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI1564_Reset(comedi_device *dev) | | | Function Name : int i_APCI1564_Reset(struct comedi_device *dev) | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task :resets all the registers | | Task :resets all the registers |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev | Input Parameters : struct comedi_device *dev
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Output Parameters : -- | | Output Parameters : -- |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@ -1081,7 +1081,7 @@ static VOID v_APCI1564_Interrupt(int irq, void *d)
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI1564_Reset(comedi_device * dev) INT i_APCI1564_Reset(struct comedi_device * dev)
{ {
outl(0x0, devpriv->i_IobaseAmcc + APCI1564_DIGITAL_IP_IRQ); //disable the interrupts outl(0x0, devpriv->i_IobaseAmcc + APCI1564_DIGITAL_IP_IRQ); //disable the interrupts
inl(devpriv->i_IobaseAmcc + APCI1564_DIGITAL_IP_INTERRUPT_STATUS); //Reset the interrupt status register inl(devpriv->i_IobaseAmcc + APCI1564_DIGITAL_IP_INTERRUPT_STATUS); //Reset the interrupt status register

22
drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.h
View File

@ -82,33 +82,33 @@
//DI //DI
// for di read // for di read
INT i_APCI1564_ConfigDigitalInput(comedi_device *dev, comedi_subdevice *s, INT i_APCI1564_ConfigDigitalInput(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
INT i_APCI1564_Read1DigitalInput(comedi_device *dev, comedi_subdevice *s, INT i_APCI1564_Read1DigitalInput(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
INT i_APCI1564_ReadMoreDigitalInput(comedi_device *dev, comedi_subdevice *s, INT i_APCI1564_ReadMoreDigitalInput(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
//DO //DO
int i_APCI1564_ConfigDigitalOutput(comedi_device *dev, comedi_subdevice *s, int i_APCI1564_ConfigDigitalOutput(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
INT i_APCI1564_WriteDigitalOutput(comedi_device *dev, comedi_subdevice *s, INT i_APCI1564_WriteDigitalOutput(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
INT i_APCI1564_ReadDigitalOutput(comedi_device *dev, comedi_subdevice *s, INT i_APCI1564_ReadDigitalOutput(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
int i_APCI1564_ReadInterruptStatus(comedi_device *dev, comedi_subdevice *s, int i_APCI1564_ReadInterruptStatus(struct comedi_device *dev, 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(comedi_device *dev, INT i_APCI1564_ConfigTimerCounterWatchdog(struct comedi_device *dev,
comedi_subdevice *s, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
int i_APCI1564_StartStopWriteTimerCounterWatchdog(comedi_device *dev, int i_APCI1564_StartStopWriteTimerCounterWatchdog(struct comedi_device *dev,
comedi_subdevice *s, comedi_subdevice *s,
comedi_insn *insn, comedi_insn *insn,
unsigned int *data); unsigned int *data);
int i_APCI1564_ReadTimerCounterWatchdog(comedi_device *dev, int i_APCI1564_ReadTimerCounterWatchdog(struct comedi_device *dev,
comedi_subdevice *s, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
@ -116,4 +116,4 @@ int i_APCI1564_ReadTimerCounterWatchdog(comedi_device *dev,
static VOID v_APCI1564_Interrupt(int irq, void *d); static VOID v_APCI1564_Interrupt(int irq, void *d);
// RESET // RESET
INT i_APCI1564_Reset(comedi_device *dev); INT i_APCI1564_Reset(struct comedi_device *dev);

22
drivers/staging/comedi/drivers/addi-data/hwdrv_apci16xx.c
View File

@ -58,7 +58,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 |
| (comedi_device *dev, | | (struct comedi_device *dev, |
| comedi_subdevice *s, | | comedi_subdevice *s, |
| comedi_insn *insn, | | comedi_insn *insn, |
| unsigned int *data) | | unsigned int *data) |
@ -90,7 +90,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI16XX_InsnConfigInitTTLIO(comedi_device * dev, int i_APCI16XX_InsnConfigInitTTLIO(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
INT i_ReturnValue = insn->n; INT i_ReturnValue = insn->n;
@ -251,7 +251,7 @@ int i_APCI16XX_InsnConfigInitTTLIO(comedi_device * dev,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : INT i_APCI16XX_InsnBitsReadTTLIO | | Function Name : INT i_APCI16XX_InsnBitsReadTTLIO |
| (comedi_device *dev, | | (struct comedi_device *dev, |
| comedi_subdevice *s, | | comedi_subdevice *s, |
| comedi_insn *insn, | | comedi_insn *insn, |
| unsigned int *data) | | unsigned int *data) |
@ -283,7 +283,7 @@ int i_APCI16XX_InsnConfigInitTTLIO(comedi_device * dev,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI16XX_InsnBitsReadTTLIO(comedi_device * dev, int i_APCI16XX_InsnBitsReadTTLIO(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
INT i_ReturnValue = insn->n; INT i_ReturnValue = insn->n;
@ -411,7 +411,7 @@ int i_APCI16XX_InsnBitsReadTTLIO(comedi_device * dev,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : INT i_APCI16XX_InsnReadTTLIOAllPortValue | | Function Name : INT i_APCI16XX_InsnReadTTLIOAllPortValue |
| (comedi_device *dev, | | (struct comedi_device *dev, |
| comedi_subdevice *s, | | comedi_subdevice *s, |
| comedi_insn *insn, | | comedi_insn *insn, |
| unsigned int *data) | | unsigned int *data) |
@ -430,7 +430,7 @@ int i_APCI16XX_InsnBitsReadTTLIO(comedi_device * dev,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI16XX_InsnReadTTLIOAllPortValue(comedi_device * dev, int i_APCI16XX_InsnReadTTLIOAllPortValue(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) 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);
@ -536,7 +536,7 @@ int i_APCI16XX_InsnReadTTLIOAllPortValue(comedi_device * dev,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : INT i_APCI16XX_InsnBitsWriteTTLIO | | Function Name : INT i_APCI16XX_InsnBitsWriteTTLIO |
| (comedi_device *dev, | | (struct comedi_device *dev, |
| comedi_subdevice *s, | | comedi_subdevice *s, |
| comedi_insn *insn, | | comedi_insn *insn, |
| unsigned int *data) | | unsigned int *data) |
@ -570,7 +570,7 @@ int i_APCI16XX_InsnReadTTLIOAllPortValue(comedi_device * dev,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI16XX_InsnBitsWriteTTLIO(comedi_device * dev, int i_APCI16XX_InsnBitsWriteTTLIO(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
INT i_ReturnValue = insn->n; INT i_ReturnValue = insn->n;
@ -763,10 +763,10 @@ int i_APCI16XX_InsnBitsWriteTTLIO(comedi_device * dev,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI2200_Reset(comedi_device *dev) | +----------------------------------------------------------------------------+ | Function Name : int i_APCI2200_Reset(struct comedi_device *dev) | +----------------------------------------------------------------------------+
| Task :resets all the registers | | Task :resets all the registers |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev | | Input Parameters : struct comedi_device *dev |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Output Parameters : - | | Output Parameters : - |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@ -774,7 +774,7 @@ int i_APCI16XX_InsnBitsWriteTTLIO(comedi_device * dev,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI16XX_Reset(comedi_device * dev) int i_APCI16XX_Reset(struct comedi_device * dev)
{ {
return 0; return 0;
} }

10
drivers/staging/comedi/drivers/addi-data/hwdrv_apci16xx.h
View File

@ -62,7 +62,7 @@ static const comedi_lrange range_apci16xx_ttl = { 12,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI16XX_InsnConfigInitTTLIO(comedi_device *dev, int i_APCI16XX_InsnConfigInitTTLIO(struct comedi_device *dev,
comedi_subdevice *s, comedi_insn *insn, comedi_subdevice *s, comedi_insn *insn,
unsigned int *data); unsigned int *data);
@ -72,11 +72,11 @@ int i_APCI16XX_InsnConfigInitTTLIO(comedi_device *dev,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI16XX_InsnBitsReadTTLIO(comedi_device *dev, int i_APCI16XX_InsnBitsReadTTLIO(struct comedi_device *dev,
comedi_subdevice *s, comedi_insn *insn, comedi_subdevice *s, comedi_insn *insn,
unsigned int *data); unsigned int *data);
int i_APCI16XX_InsnReadTTLIOAllPortValue(comedi_device *dev, int i_APCI16XX_InsnReadTTLIOAllPortValue(struct comedi_device *dev,
comedi_subdevice *s, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
@ -86,9 +86,9 @@ int i_APCI16XX_InsnReadTTLIOAllPortValue(comedi_device *dev,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI16XX_InsnBitsWriteTTLIO(comedi_device *dev, int i_APCI16XX_InsnBitsWriteTTLIO(struct comedi_device *dev,
comedi_subdevice *s, comedi_insn *insn, comedi_subdevice *s, comedi_insn *insn,
unsigned int *data); unsigned int *data);
int i_APCI16XX_Reset(comedi_device *dev); int i_APCI16XX_Reset(struct comedi_device *dev);
#endif #endif

42
drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.c
View File

@ -56,12 +56,12 @@ 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 |
| (comedi_device *dev,comedi_subdevice *s, | | (struct comedi_device *dev,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. |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| UINT *data : Data Pointer contains | | UINT *data : Data Pointer contains |
| configuration parameters as below | | configuration parameters as below |
| | | |
@ -75,7 +75,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI2016_ConfigDigitalOutput(comedi_device * dev, comedi_subdevice * s, int i_APCI2016_ConfigDigitalOutput(struct comedi_device * dev, 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,12 +95,12 @@ int i_APCI2016_ConfigDigitalOutput(comedi_device * dev, comedi_subdevice * s,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI2016_WriteDigitalOutput | | Function Name : int i_APCI2016_WriteDigitalOutput |
| (comedi_device *dev,comedi_subdevice *s, | | (struct comedi_device *dev,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 |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| UINT ui_NoOfChannels : No Of Channels To Write | | UINT ui_NoOfChannels : No Of Channels To Write |
| UINT *data : Data Pointer to read status | | UINT *data : Data Pointer to read status |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@ -111,7 +111,7 @@ int i_APCI2016_ConfigDigitalOutput(comedi_device * dev, comedi_subdevice * s,
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI2016_WriteDigitalOutput(comedi_device * dev, comedi_subdevice * s, int i_APCI2016_WriteDigitalOutput(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
UINT ui_NoOfChannel; UINT ui_NoOfChannel;
@ -250,12 +250,12 @@ int i_APCI2016_WriteDigitalOutput(comedi_device * dev, comedi_subdevice * s,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI2016_BitsDigitalOutput | | Function Name : int i_APCI2016_BitsDigitalOutput |
| (comedi_device *dev,comedi_subdevice *s, | | (struct comedi_device *dev,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 |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| UINT ui_NoOfChannels : No Of Channels To read | | UINT ui_NoOfChannels : No Of Channels To read |
| UINT *data : Data Pointer to read status | | UINT *data : Data Pointer to read status |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@ -266,7 +266,7 @@ int i_APCI2016_WriteDigitalOutput(comedi_device * dev, comedi_subdevice * s,
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI2016_BitsDigitalOutput(comedi_device * dev, comedi_subdevice * s, int i_APCI2016_BitsDigitalOutput(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
UINT ui_Temp; UINT ui_Temp;
@ -320,12 +320,12 @@ int i_APCI2016_BitsDigitalOutput(comedi_device * dev, comedi_subdevice * s,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI2016_ConfigWatchdog | | Function Name : int i_APCI2016_ConfigWatchdog |
| (comedi_device *dev,comedi_subdevice *s, | | (struct comedi_device *dev,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 : comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| comedi_subdevice *s, :pointer to subdevice structure | | 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(comedi_device * dev, comedi_subdevice * s,
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI2016_ConfigWatchdog(comedi_device * dev, comedi_subdevice * s, int i_APCI2016_ConfigWatchdog(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
@ -363,12 +363,12 @@ int i_APCI2016_ConfigWatchdog(comedi_device * dev, comedi_subdevice * s,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI2016_StartStopWriteWatchdog | | Function Name : int i_APCI2016_StartStopWriteWatchdog |
| (comedi_device *dev,comedi_subdevice *s, | | (struct comedi_device *dev,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 : comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| comedi_subdevice *s, :pointer to subdevice structure | | 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(comedi_device * dev, comedi_subdevice * s,
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI2016_StartStopWriteWatchdog(comedi_device * dev, comedi_subdevice * s, int i_APCI2016_StartStopWriteWatchdog(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
@ -409,12 +409,12 @@ int i_APCI2016_StartStopWriteWatchdog(comedi_device * dev, comedi_subdevice * s,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI2016_ReadWatchdog | | Function Name : int i_APCI2016_ReadWatchdog |
| (comedi_device *dev,comedi_subdevice *s, | | (struct comedi_device *dev,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 : comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| comedi_subdevice *s, :pointer to subdevice structure | | 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(comedi_device * dev, comedi_subdevice * s,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI2016_ReadWatchdog(comedi_device * dev, comedi_subdevice * s, int i_APCI2016_ReadWatchdog(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
udelay(5); udelay(5);
@ -437,11 +437,11 @@ int i_APCI2016_ReadWatchdog(comedi_device * dev, comedi_subdevice * s,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI2016_Reset(comedi_device *dev) | | | Function Name : int i_APCI2016_Reset(struct comedi_device *dev) | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task :resets all the registers | | Task :resets all the registers |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev | Input Parameters : struct comedi_device *dev
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Output Parameters : -- | | Output Parameters : -- |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@ -450,7 +450,7 @@ int i_APCI2016_ReadWatchdog(comedi_device * dev, comedi_subdevice * s,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI2016_Reset(comedi_device * dev) INT i_APCI2016_Reset(struct comedi_device * dev)
{ {
outw(0x0, devpriv->iobase + APCI2016_DIGITAL_OP); // Resets the digital output channels outw(0x0, devpriv->iobase + APCI2016_DIGITAL_OP); // Resets the digital output channels
outw(0x0, devpriv->i_IobaseAddon + APCI2016_WATCHDOG_ENABLEDISABLE); outw(0x0, devpriv->i_IobaseAddon + APCI2016_WATCHDOG_ENABLEDISABLE);

14
drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.h
View File

@ -40,25 +40,25 @@
// Hardware Layer functions for Apci2016 // Hardware Layer functions for Apci2016
//DO //DO
int i_APCI2016_ConfigDigitalOutput(comedi_device *dev, comedi_subdevice *s, int i_APCI2016_ConfigDigitalOutput(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
int i_APCI2016_WriteDigitalOutput(comedi_device *dev, comedi_subdevice *s, int i_APCI2016_WriteDigitalOutput(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
int i_APCI2016_BitsDigitalOutput(comedi_device *dev, comedi_subdevice *s, int i_APCI2016_BitsDigitalOutput(struct comedi_device *dev, 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(comedi_device *dev, comedi_subdevice *s, int i_APCI2016_ConfigWatchdog(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
int i_APCI2016_StartStopWriteWatchdog(comedi_device *dev, comedi_subdevice *s, int i_APCI2016_StartStopWriteWatchdog(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
int i_APCI2016_ReadWatchdog(comedi_device *dev, comedi_subdevice *s, int i_APCI2016_ReadWatchdog(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
// Interrupt functions..... // Interrupt functions.....
@ -67,4 +67,4 @@ int i_APCI2016_ReadWatchdog(comedi_device *dev, comedi_subdevice *s,
//VOID v_APCI2016_Interrupt(int irq, void *d); //VOID v_APCI2016_Interrupt(int irq, void *d);
// RESET // RESET
INT i_APCI2016_Reset(comedi_device *dev); INT i_APCI2016_Reset(struct comedi_device *dev);

44
drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.c
View File

@ -57,12 +57,12 @@ UINT ui_InterruptData, ui_Type;
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI2032_ConfigDigitalOutput | | Function Name : int i_APCI2032_ConfigDigitalOutput |
| (comedi_device *dev,comedi_subdevice *s, | | (struct comedi_device *dev,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. |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| UINT *data : Data Pointer contains | | UINT *data : Data Pointer contains |
| configuration parameters as below | | configuration parameters as below |
| | | |
@ -79,7 +79,7 @@ UINT ui_InterruptData, ui_Type;
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI2032_ConfigDigitalOutput(comedi_device * dev, comedi_subdevice * s, int i_APCI2032_ConfigDigitalOutput(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
ULONG ul_Command = 0; ULONG ul_Command = 0;
@ -117,12 +117,12 @@ int i_APCI2032_ConfigDigitalOutput(comedi_device * dev, comedi_subdevice * s,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI2032_WriteDigitalOutput | | Function Name : int i_APCI2032_WriteDigitalOutput |
| (comedi_device *dev,comedi_subdevice *s, | | (struct comedi_device *dev,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 |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| UINT ui_NoOfChannels : No Of Channels To Write | | UINT ui_NoOfChannels : No Of Channels To Write |
| UINT *data : Data Pointer to read status | | UINT *data : Data Pointer to read status |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@ -134,7 +134,7 @@ int i_APCI2032_ConfigDigitalOutput(comedi_device * dev, comedi_subdevice * s,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI2032_WriteDigitalOutput(comedi_device * dev, comedi_subdevice * s, INT i_APCI2032_WriteDigitalOutput(struct comedi_device * dev, 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,12 +296,12 @@ INT i_APCI2032_WriteDigitalOutput(comedi_device * dev, comedi_subdevice * s,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI2032_ReadDigitalOutput | | Function Name : int i_APCI2032_ReadDigitalOutput |
| (comedi_device *dev,comedi_subdevice *s, | | (struct comedi_device *dev,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 |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| UINT ui_NoOfChannels : No Of Channels To read | | UINT ui_NoOfChannels : No Of Channels To read |
| UINT *data : Data Pointer to read status | | UINT *data : Data Pointer to read status |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@ -313,7 +313,7 @@ INT i_APCI2032_WriteDigitalOutput(comedi_device * dev, comedi_subdevice * s,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI2032_ReadDigitalOutput(comedi_device * dev, comedi_subdevice * s, INT i_APCI2032_ReadDigitalOutput(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
UINT ui_Temp; UINT ui_Temp;
@ -368,7 +368,7 @@ INT i_APCI2032_ReadDigitalOutput(comedi_device * dev, comedi_subdevice * s,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Configures The Watchdog | | Task : Configures The Watchdog |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| comedi_subdevice *s, :pointer to subdevice structure | 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(comedi_device * dev, comedi_subdevice * s,
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI2032_ConfigWatchdog(comedi_device * dev, comedi_subdevice * s, INT i_APCI2032_ConfigWatchdog(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
if (data[0] == 0) { if (data[0] == 0) {
@ -403,12 +403,12 @@ INT i_APCI2032_ConfigWatchdog(comedi_device * dev, comedi_subdevice * s,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI2032_StartStopWriteWatchdog | | Function Name : int i_APCI2032_StartStopWriteWatchdog |
| (comedi_device *dev,comedi_subdevice *s, | (struct comedi_device *dev,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 : comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| comedi_subdevice *s, :pointer to subdevice structure | 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(comedi_device * dev, comedi_subdevice * s,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI2032_StartStopWriteWatchdog(comedi_device * dev, comedi_subdevice * s, int i_APCI2032_StartStopWriteWatchdog(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
switch (data[0]) { switch (data[0]) {
@ -448,12 +448,12 @@ int i_APCI2032_StartStopWriteWatchdog(comedi_device * dev, comedi_subdevice * s,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI2032_ReadWatchdog | | Function Name : int i_APCI2032_ReadWatchdog |
| (comedi_device *dev,comedi_subdevice *s,comedi_insn *insn, | (struct comedi_device *dev,comedi_subdevice *s,comedi_insn *insn,
unsigned int *data); | unsigned int *data); |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Read The Watchdog | | Task : Read The Watchdog |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| comedi_subdevice *s, :pointer to subdevice structure | 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(comedi_device * dev, comedi_subdevice * s,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI2032_ReadWatchdog(comedi_device * dev, comedi_subdevice * s, int i_APCI2032_ReadWatchdog(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
@ -495,7 +495,7 @@ int i_APCI2032_ReadWatchdog(comedi_device * dev, comedi_subdevice * s,
*/ */
void v_APCI2032_Interrupt(int irq, void *d) void v_APCI2032_Interrupt(int irq, void *d)
{ {
comedi_device *dev = d; struct comedi_device *dev = d;
unsigned int ui_DO; unsigned int ui_DO;
ui_DO = inl(devpriv->iobase + APCI2032_DIGITAL_OP_IRQ) & 0x1; //Check if VCC OR CC interrupt has occured. ui_DO = inl(devpriv->iobase + APCI2032_DIGITAL_OP_IRQ) & 0x1; //Check if VCC OR CC interrupt has occured.
@ -530,7 +530,7 @@ void v_APCI2032_Interrupt(int irq, void *d)
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI2032_ReadInterruptStatus | | Function Name : int i_APCI2032_ReadInterruptStatus |
| (comedi_device *dev,comedi_subdevice *s, | | (struct comedi_device *dev,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)
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI2032_ReadInterruptStatus(comedi_device * dev, comedi_subdevice * s, int i_APCI2032_ReadInterruptStatus(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
*data = ui_Type; *data = ui_Type;
@ -553,7 +553,7 @@ int i_APCI2032_ReadInterruptStatus(comedi_device * dev, comedi_subdevice * s,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI2032_Reset(comedi_device *dev) | | Function Name : int i_APCI2032_Reset(struct comedi_device *dev) |
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task :Resets the registers of the card | | Task :Resets the registers of the card |
@ -567,7 +567,7 @@ int i_APCI2032_ReadInterruptStatus(comedi_device * dev, comedi_subdevice * s,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI2032_Reset(comedi_device * dev) int i_APCI2032_Reset(struct comedi_device * dev)
{ {
devpriv->b_DigitalOutputRegister = 0; devpriv->b_DigitalOutputRegister = 0;
ui_Type = 0; ui_Type = 0;

16
drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.h
View File

@ -55,22 +55,22 @@
// Hardware Layer functions for Apci2032 // Hardware Layer functions for Apci2032
//DO //DO
int i_APCI2032_ConfigDigitalOutput(comedi_device *dev, comedi_subdevice *s, int i_APCI2032_ConfigDigitalOutput(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
INT i_APCI2032_WriteDigitalOutput(comedi_device *dev, comedi_subdevice *s, INT i_APCI2032_WriteDigitalOutput(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
INT i_APCI2032_ReadDigitalOutput(comedi_device *dev, comedi_subdevice *s, INT i_APCI2032_ReadDigitalOutput(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
int i_APCI2032_ReadInterruptStatus(comedi_device *dev, comedi_subdevice *s, int i_APCI2032_ReadInterruptStatus(struct comedi_device *dev, 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(comedi_device *dev, comedi_subdevice *s, INT i_APCI2032_ConfigWatchdog(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
int i_APCI2032_StartStopWriteWatchdog(comedi_device *dev, comedi_subdevice *s, int i_APCI2032_StartStopWriteWatchdog(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
int i_APCI2032_ReadWatchdog(comedi_device *dev, comedi_subdevice *s, int i_APCI2032_ReadWatchdog(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
// Interrupt functions..... // Interrupt functions.....
@ -78,4 +78,4 @@ int i_APCI2032_ReadWatchdog(comedi_device *dev, comedi_subdevice *s,
void v_APCI2032_Interrupt(int irq, void *d); void v_APCI2032_Interrupt(int irq, void *d);
//Reset functions //Reset functions
int i_APCI2032_Reset(comedi_device *dev); int i_APCI2032_Reset(struct comedi_device *dev);

54
drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.c
View File

@ -56,12 +56,12 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI2200_Read1DigitalInput | | Function Name : int i_APCI2200_Read1DigitalInput |
| (comedi_device *dev,comedi_subdevice *s, | | (struct comedi_device *dev,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 |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| comedi_subdevice *s, :pointer to subdevice structure | 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 |
@ -73,7 +73,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI2200_Read1DigitalInput(comedi_device * dev, comedi_subdevice * s, INT i_APCI2200_Read1DigitalInput(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
UINT ui_TmpValue = 0; UINT ui_TmpValue = 0;
@ -94,12 +94,12 @@ INT i_APCI2200_Read1DigitalInput(comedi_device * dev, comedi_subdevice * s,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI2200_ReadMoreDigitalInput | | Function Name : int i_APCI2200_ReadMoreDigitalInput |
| (comedi_device *dev,comedi_subdevice *s, | | (struct comedi_device *dev,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 |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| comedi_subdevice *s, :pointer to subdevice structure | 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 |
@ -112,7 +112,7 @@ INT i_APCI2200_Read1DigitalInput(comedi_device * dev, comedi_subdevice * s,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI2200_ReadMoreDigitalInput(comedi_device * dev, comedi_subdevice * s, INT i_APCI2200_ReadMoreDigitalInput(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
@ -146,13 +146,13 @@ INT i_APCI2200_ReadMoreDigitalInput(comedi_device * dev, comedi_subdevice * s,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI2200_ConfigDigitalOutput (comedi_device *dev, | Function Name : int i_APCI2200_ConfigDigitalOutput (struct comedi_device *dev,
comedi_subdevice *s comedi_insn *insn,unsigned int *data) | comedi_subdevice *s comedi_insn *insn,unsigned int *data) |
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Configures The Digital Output Subdevice. | | Task : Configures The Digital Output Subdevice. |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| unsigned int *data : Data Pointer contains | | unsigned int *data : Data Pointer contains |
| configuration parameters as below | | configuration parameters as below |
| comedi_subdevice *s, :pointer to subdevice structure | comedi_subdevice *s, :pointer to subdevice structure
@ -169,7 +169,7 @@ INT i_APCI2200_ReadMoreDigitalInput(comedi_device * dev, comedi_subdevice * s,
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI2200_ConfigDigitalOutput(comedi_device * dev, comedi_subdevice * s, int i_APCI2200_ConfigDigitalOutput(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
devpriv->b_OutputMemoryStatus = data[0]; devpriv->b_OutputMemoryStatus = data[0];
@ -179,12 +179,12 @@ int i_APCI2200_ConfigDigitalOutput(comedi_device * dev, comedi_subdevice * s,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI2200_WriteDigitalOutput | | Function Name : int i_APCI2200_WriteDigitalOutput |
| (comedi_device *dev,comedi_subdevice *s,comedi_insn *insn, | (struct comedi_device *dev,comedi_subdevice *s,comedi_insn *insn,
unsigned int *data) | unsigned int *data) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Writes port value To the selected port | | Task : Writes port value To the selected port |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| comedi_subdevice *s, :pointer to subdevice structure | 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 |
@ -197,7 +197,7 @@ int i_APCI2200_ConfigDigitalOutput(comedi_device * dev, comedi_subdevice * s,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI2200_WriteDigitalOutput(comedi_device * dev, comedi_subdevice * s, INT i_APCI2200_WriteDigitalOutput(struct comedi_device * dev, 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;
@ -336,12 +336,12 @@ INT i_APCI2200_WriteDigitalOutput(comedi_device * dev, comedi_subdevice * s,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI2200_ReadDigitalOutput | | Function Name : int i_APCI2200_ReadDigitalOutput |
| (comedi_device *dev,comedi_subdevice *s,comedi_insn *insn, | (struct comedi_device *dev,comedi_subdevice *s,comedi_insn *insn,
unsigned int *data) | unsigned int *data) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Read value of the selected channel or port | | Task : Read value of the selected channel or port |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| comedi_subdevice *s, :pointer to subdevice structure | 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 |
@ -354,7 +354,7 @@ INT i_APCI2200_WriteDigitalOutput(comedi_device * dev, comedi_subdevice * s,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI2200_ReadDigitalOutput(comedi_device * dev, comedi_subdevice * s, INT i_APCI2200_ReadDigitalOutput(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
@ -399,13 +399,13 @@ INT i_APCI2200_ReadDigitalOutput(comedi_device * dev, comedi_subdevice * s,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI2200_ConfigWatchdog(comedi_device *dev, | Function Name : int i_APCI2200_ConfigWatchdog(struct comedi_device *dev,
comedi_subdevice *s,comedi_insn *insn,unsigned int *data) | comedi_subdevice *s,comedi_insn *insn,unsigned int *data) |
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Configures The Watchdog | | Task : Configures The Watchdog |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| comedi_subdevice *s, :pointer to subdevice structure | 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 |
@ -418,7 +418,7 @@ INT i_APCI2200_ReadDigitalOutput(comedi_device * dev, comedi_subdevice * s,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI2200_ConfigWatchdog(comedi_device * dev, comedi_subdevice * s, int i_APCI2200_ConfigWatchdog(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
if (data[0] == 0) { if (data[0] == 0) {
@ -446,12 +446,12 @@ int i_APCI2200_ConfigWatchdog(comedi_device * dev, comedi_subdevice * s,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI2200_StartStopWriteWatchdog | | Function Name : int i_APCI2200_StartStopWriteWatchdog |
| (comedi_device *dev,comedi_subdevice *s, | (struct comedi_device *dev,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 : comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| comedi_subdevice *s, :pointer to subdevice structure | 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 |
@ -464,7 +464,7 @@ int i_APCI2200_ConfigWatchdog(comedi_device * dev, comedi_subdevice * s,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI2200_StartStopWriteWatchdog(comedi_device * dev, comedi_subdevice * s, int i_APCI2200_StartStopWriteWatchdog(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
switch (data[0]) { switch (data[0]) {
@ -491,12 +491,12 @@ int i_APCI2200_StartStopWriteWatchdog(comedi_device * dev, comedi_subdevice * s,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI2200_ReadWatchdog | | Function Name : int i_APCI2200_ReadWatchdog |
| (comedi_device *dev,comedi_subdevice *s,comedi_insn *insn, | (struct comedi_device *dev,comedi_subdevice *s,comedi_insn *insn,
unsigned int *data); | unsigned int *data); |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Read The Watchdog | | Task : Read The Watchdog |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| comedi_subdevice *s, :pointer to subdevice structure | 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 |
@ -509,7 +509,7 @@ int i_APCI2200_StartStopWriteWatchdog(comedi_device * dev, comedi_subdevice * s,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI2200_ReadWatchdog(comedi_device * dev, comedi_subdevice * s, int i_APCI2200_ReadWatchdog(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
data[0] = data[0] =
@ -520,11 +520,11 @@ int i_APCI2200_ReadWatchdog(comedi_device * dev, comedi_subdevice * s,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI2200_Reset(comedi_device *dev) | | | Function Name : int i_APCI2200_Reset(struct comedi_device *dev) | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task :resets all the registers | | Task :resets all the registers |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev | Input Parameters : struct comedi_device *dev
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Output Parameters : -- | | Output Parameters : -- |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@ -533,7 +533,7 @@ int i_APCI2200_ReadWatchdog(comedi_device * dev, comedi_subdevice * s,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI2200_Reset(comedi_device * dev) INT i_APCI2200_Reset(struct comedi_device * dev)
{ {
outw(0x0, devpriv->iobase + APCI2200_DIGITAL_OP); //RESETS THE DIGITAL OUTPUTS outw(0x0, devpriv->iobase + APCI2200_DIGITAL_OP); //RESETS THE DIGITAL OUTPUTS
outw(0x0, outw(0x0,

18
drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.h
View File

@ -36,26 +36,26 @@
// Hardware Layer functions for Apci2200 // Hardware Layer functions for Apci2200
//Digital Input //Digital Input
INT i_APCI2200_ReadMoreDigitalInput(comedi_device *dev, comedi_subdevice *s, INT i_APCI2200_ReadMoreDigitalInput(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
INT i_APCI2200_Read1DigitalInput(comedi_device *dev, comedi_subdevice *s, INT i_APCI2200_Read1DigitalInput(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
//Digital Output //Digital Output
int i_APCI2200_ConfigDigitalOutput(comedi_device *dev, comedi_subdevice *s, int i_APCI2200_ConfigDigitalOutput(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
INT i_APCI2200_WriteDigitalOutput(comedi_device *dev, comedi_subdevice *s, INT i_APCI2200_WriteDigitalOutput(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
INT i_APCI2200_ReadDigitalOutput(comedi_device *dev, comedi_subdevice *s, INT i_APCI2200_ReadDigitalOutput(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
// TIMER // TIMER
int i_APCI2200_ConfigWatchdog(comedi_device *dev, comedi_subdevice *s, int i_APCI2200_ConfigWatchdog(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
int i_APCI2200_StartStopWriteWatchdog(comedi_device *dev, comedi_subdevice *s, int i_APCI2200_StartStopWriteWatchdog(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
int i_APCI2200_ReadWatchdog(comedi_device *dev, comedi_subdevice *s, int i_APCI2200_ReadWatchdog(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
//reset //reset
INT i_APCI2200_Reset(comedi_device *dev); INT i_APCI2200_Reset(struct comedi_device *dev);

130
drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
View File

@ -57,14 +57,14 @@ static UINT ui_Temp = 0;
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function name :int i_APCI3120_InsnConfigAnalogInput(comedi_device *dev,| | Function name :int i_APCI3120_InsnConfigAnalogInput(struct comedi_device *dev,|
| comedi_subdevice *s,comedi_insn *insn,unsigned int *data) | | comedi_subdevice *s,comedi_insn *insn,unsigned int *data) |
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Calls card specific function | | Task : Calls card specific function |
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev | | Input Parameters : struct comedi_device *dev |
| comedi_subdevice *s | | comedi_subdevice *s |
| comedi_insn *insn | | comedi_insn *insn |
| unsigned int *data | | unsigned int *data |
@ -74,7 +74,7 @@ static UINT ui_Temp = 0;
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI3120_InsnConfigAnalogInput(comedi_device * dev, comedi_subdevice * s, int i_APCI3120_InsnConfigAnalogInput(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
UINT i; UINT i;
@ -124,7 +124,7 @@ int i_APCI3120_InsnConfigAnalogInput(comedi_device * dev, comedi_subdevice * s,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function name :int i_APCI3120_InsnReadAnalogInput(comedi_device *dev, | | Function name :int i_APCI3120_InsnReadAnalogInput(struct comedi_device *dev, |
| comedi_subdevice *s,comedi_insn *insn, unsigned int *data) | | comedi_subdevice *s,comedi_insn *insn, unsigned int *data) |
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@ -135,7 +135,7 @@ int i_APCI3120_InsnConfigAnalogInput(comedi_device * dev, comedi_subdevice * s,
| time 10 microsec. | | time 10 microsec. |
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev | | Input Parameters : struct comedi_device *dev |
| comedi_subdevice *s | | comedi_subdevice *s |
| comedi_insn *insn | | comedi_insn *insn |
| unsigned int *data | | unsigned int *data |
@ -145,7 +145,7 @@ int i_APCI3120_InsnConfigAnalogInput(comedi_device * dev, comedi_subdevice * s,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI3120_InsnReadAnalogInput(comedi_device * dev, comedi_subdevice * s, int i_APCI3120_InsnReadAnalogInput(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
USHORT us_ConvertTiming, us_TmpValue, i; USHORT us_ConvertTiming, us_TmpValue, i;
@ -393,14 +393,14 @@ int i_APCI3120_InsnReadAnalogInput(comedi_device * dev, comedi_subdevice * s,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function name :int i_APCI3120_StopCyclicAcquisition(comedi_device *dev,| | Function name :int i_APCI3120_StopCyclicAcquisition(struct comedi_device *dev,|
| comedi_subdevice *s)| | comedi_subdevice *s)|
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Stops Cyclic acquisition | | Task : Stops Cyclic acquisition |
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev | | Input Parameters : struct comedi_device *dev |
| comedi_subdevice *s | | comedi_subdevice *s |
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@ -409,7 +409,7 @@ int i_APCI3120_InsnReadAnalogInput(comedi_device * dev, comedi_subdevice * s,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI3120_StopCyclicAcquisition(comedi_device * dev, comedi_subdevice * s) int i_APCI3120_StopCyclicAcquisition(struct comedi_device * dev, comedi_subdevice * s)
{ {
// Disable A2P Fifo write and AMWEN signal // Disable A2P Fifo write and AMWEN signal
outw(0, devpriv->i_IobaseAddon + 4); outw(0, devpriv->i_IobaseAddon + 4);
@ -459,7 +459,7 @@ int i_APCI3120_StopCyclicAcquisition(comedi_device * dev, comedi_subdevice * s)
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function name :int i_APCI3120_CommandTestAnalogInput(comedi_device *dev| | Function name :int i_APCI3120_CommandTestAnalogInput(struct comedi_device *dev|
| ,comedi_subdevice *s,comedi_cmd *cmd) | | ,comedi_subdevice *s,comedi_cmd *cmd) |
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@ -467,7 +467,7 @@ int i_APCI3120_StopCyclicAcquisition(comedi_device * dev, comedi_subdevice * s)
| acquisition | | acquisition |
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev | | Input Parameters : struct comedi_device *dev |
| comedi_subdevice *s | | comedi_subdevice *s |
| comedi_cmd *cmd | | comedi_cmd *cmd |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@ -476,7 +476,7 @@ int i_APCI3120_StopCyclicAcquisition(comedi_device * dev, comedi_subdevice * s)
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI3120_CommandTestAnalogInput(comedi_device * dev, comedi_subdevice * s, int i_APCI3120_CommandTestAnalogInput(struct comedi_device * dev, comedi_subdevice * s,
comedi_cmd * cmd) comedi_cmd * cmd)
{ {
int err = 0; int err = 0;
@ -616,7 +616,7 @@ int i_APCI3120_CommandTestAnalogInput(comedi_device * dev, comedi_subdevice * s,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function name : int i_APCI3120_CommandAnalogInput(comedi_device *dev, | | Function name : int i_APCI3120_CommandAnalogInput(struct comedi_device *dev, |
| comedi_subdevice *s) | | comedi_subdevice *s) |
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@ -624,7 +624,7 @@ int i_APCI3120_CommandTestAnalogInput(comedi_device * dev, comedi_subdevice * s,
| Determines the mode 1 or 2. | | Determines the mode 1 or 2. |
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev | | Input Parameters : struct comedi_device *dev |
| comedi_subdevice *s | | comedi_subdevice *s |
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@ -633,7 +633,7 @@ int i_APCI3120_CommandTestAnalogInput(comedi_device * dev, comedi_subdevice * s,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI3120_CommandAnalogInput(comedi_device * dev, comedi_subdevice * s) int i_APCI3120_CommandAnalogInput(struct comedi_device * dev, comedi_subdevice * s)
{ {
comedi_cmd *cmd = &s->async->cmd; comedi_cmd *cmd = &s->async->cmd;
@ -690,7 +690,7 @@ int i_APCI3120_CommandAnalogInput(comedi_device * dev, comedi_subdevice * s)
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function name : int i_APCI3120_CyclicAnalogInput(int mode, | | Function name : int i_APCI3120_CyclicAnalogInput(int mode, |
| comedi_device * dev,comedi_subdevice * s) | | struct comedi_device * dev,comedi_subdevice * s) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : This is used for analog input cyclic acquisition | | Task : This is used for analog input cyclic acquisition |
| Performs the command operations. | | Performs the command operations. |
@ -707,7 +707,7 @@ int i_APCI3120_CommandAnalogInput(comedi_device * dev, comedi_subdevice * s)
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI3120_CyclicAnalogInput(int mode, comedi_device * dev, int i_APCI3120_CyclicAnalogInput(int mode, struct comedi_device * dev,
comedi_subdevice * s) comedi_subdevice * s)
{ {
BYTE b_Tmp; BYTE b_Tmp;
@ -1202,14 +1202,14 @@ int i_APCI3120_CyclicAnalogInput(int mode, comedi_device * dev,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function name : int i_APCI3120_Reset(comedi_device *dev) | | Function name : int i_APCI3120_Reset(struct comedi_device *dev) |
| | | |
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Hardware reset function | | Task : Hardware reset function |
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev | | Input Parameters : struct comedi_device *dev |
| | | |
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@ -1218,7 +1218,7 @@ int i_APCI3120_CyclicAnalogInput(int mode, comedi_device * dev,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI3120_Reset(comedi_device * dev) int i_APCI3120_Reset(struct comedi_device * dev)
{ {
unsigned int i; unsigned int i;
unsigned short us_TmpValue; unsigned short us_TmpValue;
@ -1274,7 +1274,7 @@ int i_APCI3120_Reset(comedi_device * dev)
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function name : int i_APCI3120_SetupChannelList(comedi_device * dev, | | Function name : int i_APCI3120_SetupChannelList(struct comedi_device * dev, |
| comedi_subdevice * s, int n_chan,unsigned int *chanlist| | comedi_subdevice * s, int n_chan,unsigned int *chanlist|
| ,char check) | | ,char check) |
| | | |
@ -1285,7 +1285,7 @@ int i_APCI3120_Reset(comedi_device * dev)
|list is ok or not. | |list is ok or not. |
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device * dev | | Input Parameters : struct comedi_device * dev |
| comedi_subdevice * s | | comedi_subdevice * s |
| int n_chan | | int n_chan |
unsigned int *chanlist unsigned int *chanlist
@ -1296,7 +1296,7 @@ int i_APCI3120_Reset(comedi_device * dev)
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI3120_SetupChannelList(comedi_device * dev, comedi_subdevice * s, int i_APCI3120_SetupChannelList(struct comedi_device * dev, comedi_subdevice * s,
int n_chan, unsigned int *chanlist, char check) int n_chan, unsigned int *chanlist, char check)
{ {
unsigned int i; //, differencial=0, bipolar=0; unsigned int i; //, differencial=0, bipolar=0;
@ -1344,14 +1344,14 @@ int i_APCI3120_SetupChannelList(comedi_device * dev, comedi_subdevice * s,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function name : int i_APCI3120_ExttrigEnable(comedi_device * dev) | | Function name : int i_APCI3120_ExttrigEnable(struct comedi_device * dev) |
| | | |
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Enable the external trigger | | Task : Enable the external trigger |
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device * dev | | Input Parameters : struct comedi_device * dev |
| | | |
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@ -1360,7 +1360,7 @@ int i_APCI3120_SetupChannelList(comedi_device * dev, comedi_subdevice * s,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI3120_ExttrigEnable(comedi_device * dev) int i_APCI3120_ExttrigEnable(struct comedi_device * dev)
{ {
devpriv->us_OutputRegister |= APCI3120_ENABLE_EXT_TRIGGER; devpriv->us_OutputRegister |= APCI3120_ENABLE_EXT_TRIGGER;
@ -1370,13 +1370,13 @@ int i_APCI3120_ExttrigEnable(comedi_device * dev)
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function name : int i_APCI3120_ExttrigDisable(comedi_device * dev) | | Function name : int i_APCI3120_ExttrigDisable(struct comedi_device * dev) |
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Disables the external trigger | | Task : Disables the external trigger |
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device * dev | | Input Parameters : struct comedi_device * dev |
| | | |
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@ -1385,7 +1385,7 @@ int i_APCI3120_ExttrigEnable(comedi_device * dev)
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI3120_ExttrigDisable(comedi_device * dev) int i_APCI3120_ExttrigDisable(struct comedi_device * dev)
{ {
devpriv->us_OutputRegister &= ~APCI3120_ENABLE_EXT_TRIGGER; devpriv->us_OutputRegister &= ~APCI3120_ENABLE_EXT_TRIGGER;
outw(devpriv->us_OutputRegister, dev->iobase + APCI3120_WR_ADDRESS); outw(devpriv->us_OutputRegister, dev->iobase + APCI3120_WR_ADDRESS);
@ -1421,7 +1421,7 @@ int i_APCI3120_ExttrigDisable(comedi_device * dev)
void v_APCI3120_Interrupt(int irq, void *d) void v_APCI3120_Interrupt(int irq, void *d)
{ {
comedi_device *dev = d; struct comedi_device *dev = d;
USHORT int_daq; USHORT int_daq;
unsigned int int_amcc, ui_Check, i; unsigned int int_amcc, ui_Check, i;
@ -1612,7 +1612,7 @@ void v_APCI3120_Interrupt(int irq, void *d)
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function name :int i_APCI3120_InterruptHandleEos(comedi_device *dev) | | Function name :int i_APCI3120_InterruptHandleEos(struct comedi_device *dev) |
| | | |
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@ -1621,7 +1621,7 @@ void v_APCI3120_Interrupt(int irq, void *d)
| to Comedi buffer. | | to Comedi buffer. |
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev | | Input Parameters : struct comedi_device *dev |
| | | |
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@ -1630,7 +1630,7 @@ void v_APCI3120_Interrupt(int irq, void *d)
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
/*int i_APCI3120_InterruptHandleEos(comedi_device *dev) /*int i_APCI3120_InterruptHandleEos(struct comedi_device *dev)
{ {
int n_chan,i; int n_chan,i;
short *data; short *data;
@ -1654,7 +1654,7 @@ void v_APCI3120_Interrupt(int irq, void *d)
} }
return 0; return 0;
}*/ }*/
int i_APCI3120_InterruptHandleEos(comedi_device * dev) int i_APCI3120_InterruptHandleEos(struct comedi_device * dev)
{ {
int n_chan, i; int n_chan, i;
comedi_subdevice *s = dev->subdevices + 0; comedi_subdevice *s = dev->subdevices + 0;
@ -1698,7 +1698,7 @@ int i_APCI3120_InterruptHandleEos(comedi_device * dev)
void v_APCI3120_InterruptDma(int irq, void *d) void v_APCI3120_InterruptDma(int irq, void *d)
{ {
comedi_device *dev = d; struct comedi_device *dev = d;
comedi_subdevice *s = dev->subdevices + 0; comedi_subdevice *s = dev->subdevices + 0;
unsigned int next_dma_buf, samplesinbuf; unsigned int next_dma_buf, samplesinbuf;
unsigned long low_word, high_word, var; unsigned long low_word, high_word, var;
@ -1886,7 +1886,7 @@ void v_APCI3120_InterruptDma(int irq, void *d)
| Comedi buffer | | Comedi buffer |
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev | | Input Parameters : struct comedi_device *dev |
| comedi_subdevice *s | | comedi_subdevice *s |
| short *dma | | short *dma |
| short *data,int n | | short *data,int n |
@ -1896,7 +1896,7 @@ void v_APCI3120_InterruptDma(int irq, void *d)
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
/*void v_APCI3120_InterruptDmaMoveBlock16bit(comedi_device *dev,comedi_subdevice *s,short *dma,short *data,int n) /*void v_APCI3120_InterruptDmaMoveBlock16bit(struct comedi_device *dev,comedi_subdevice *s,short *dma,short *data,int n)
{ {
int i,j,m; int i,j,m;
@ -1925,7 +1925,7 @@ void v_APCI3120_InterruptDma(int irq, void *d)
} }
*/ */
void v_APCI3120_InterruptDmaMoveBlock16bit(comedi_device * dev, void v_APCI3120_InterruptDmaMoveBlock16bit(struct comedi_device * dev,
comedi_subdevice * s, short * dma_buffer, unsigned int num_samples) comedi_subdevice * s, short * dma_buffer, unsigned int num_samples)
{ {
devpriv->ui_AiActualScan += devpriv->ui_AiActualScan +=
@ -1944,14 +1944,14 @@ void v_APCI3120_InterruptDmaMoveBlock16bit(comedi_device * dev,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function name :int i_APCI3120_InsnConfigTimer(comedi_device *dev, | | Function name :int i_APCI3120_InsnConfigTimer(struct comedi_device *dev, |
| comedi_subdevice *s,comedi_insn *insn,unsigned int *data) | | comedi_subdevice *s,comedi_insn *insn,unsigned int *data) |
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task :Configure Timer 2 | | Task :Configure Timer 2 |
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev | | Input Parameters : struct comedi_device *dev |
| comedi_subdevice *s | | comedi_subdevice *s |
| comedi_insn *insn | | comedi_insn *insn |
| unsigned int *data | | unsigned int *data |
@ -1967,7 +1967,7 @@ void v_APCI3120_InterruptDmaMoveBlock16bit(comedi_device * dev,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI3120_InsnConfigTimer(comedi_device * dev, comedi_subdevice * s, int i_APCI3120_InsnConfigTimer(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
@ -2092,13 +2092,13 @@ int i_APCI3120_InsnConfigTimer(comedi_device * dev, comedi_subdevice * s,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function name :int i_APCI3120_InsnWriteTimer(comedi_device *dev, | | Function name :int i_APCI3120_InsnWriteTimer(struct comedi_device *dev, |
| comedi_subdevice *s, comedi_insn *insn,unsigned int *data) | | comedi_subdevice *s, comedi_insn *insn,unsigned int *data) |
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : To start and stop the timer | | Task : To start and stop the timer |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev | | Input Parameters : struct comedi_device *dev |
| comedi_subdevice *s | | comedi_subdevice *s |
| comedi_insn *insn | | comedi_insn *insn |
| unsigned int *data | | unsigned int *data |
@ -2118,7 +2118,7 @@ int i_APCI3120_InsnConfigTimer(comedi_device * dev, comedi_subdevice * s,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI3120_InsnWriteTimer(comedi_device * dev, comedi_subdevice * s, int i_APCI3120_InsnWriteTimer(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
@ -2283,14 +2283,14 @@ int i_APCI3120_InsnWriteTimer(comedi_device * dev, comedi_subdevice * s,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function name : int i_APCI3120_InsnReadTimer(comedi_device *dev, | | Function name : int i_APCI3120_InsnReadTimer(struct comedi_device *dev, |
| comedi_subdevice *s,comedi_insn *insn, unsigned int *data) | | comedi_subdevice *s,comedi_insn *insn, unsigned int *data) |
| | | |
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : read the Timer value | | Task : read the Timer value |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev | | Input Parameters : struct comedi_device *dev |
| comedi_subdevice *s | | comedi_subdevice *s |
| comedi_insn *insn | | comedi_insn *insn |
| unsigned int *data | | unsigned int *data |
@ -2304,7 +2304,7 @@ int i_APCI3120_InsnWriteTimer(comedi_device * dev, comedi_subdevice * s,
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI3120_InsnReadTimer(comedi_device * dev, comedi_subdevice * s, int i_APCI3120_InsnReadTimer(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
BYTE b_Tmp; BYTE b_Tmp;
@ -2360,7 +2360,7 @@ int i_APCI3120_InsnReadTimer(comedi_device * dev, comedi_subdevice * s,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function name :int i_APCI3120_InsnReadDigitalInput(comedi_device *dev, | | Function name :int i_APCI3120_InsnReadDigitalInput(struct comedi_device *dev, |
| comedi_subdevice *s, comedi_insn *insn,unsigned int *data) | | comedi_subdevice *s, comedi_insn *insn,unsigned int *data) |
| | | |
| | | |
@ -2368,7 +2368,7 @@ int i_APCI3120_InsnReadTimer(comedi_device * dev, comedi_subdevice * s,
| Task : Reads the value of the specified Digital input channel| | Task : Reads the value of the specified Digital input channel|
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev | | Input Parameters : struct comedi_device *dev |
| comedi_subdevice *s | | comedi_subdevice *s |
| comedi_insn *insn | | comedi_insn *insn |
| unsigned int *data | | unsigned int *data |
@ -2378,7 +2378,7 @@ int i_APCI3120_InsnReadTimer(comedi_device * dev, comedi_subdevice * s,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI3120_InsnReadDigitalInput(comedi_device * dev, comedi_subdevice int i_APCI3120_InsnReadDigitalInput(struct comedi_device * dev, comedi_subdevice
* s, comedi_insn * insn, unsigned int * data) * s, comedi_insn * insn, unsigned int * data)
{ {
UINT ui_Chan, ui_TmpValue; UINT ui_Chan, ui_TmpValue;
@ -2403,7 +2403,7 @@ int i_APCI3120_InsnReadDigitalInput(comedi_device * dev, comedi_subdevice
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function name :int i_APCI3120_InsnBitsDigitalInput(comedi_device *dev, | | Function name :int i_APCI3120_InsnBitsDigitalInput(struct comedi_device *dev, |
|comedi_subdevice *s, comedi_insn *insn,unsigned int *data) | |comedi_subdevice *s, comedi_insn *insn,unsigned int *data) |
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@ -2411,7 +2411,7 @@ int i_APCI3120_InsnReadDigitalInput(comedi_device * dev, comedi_subdevice
| value is returned in data[0] | | value is returned in data[0] |
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev | | Input Parameters : struct comedi_device *dev |
| comedi_subdevice *s | | comedi_subdevice *s |
| comedi_insn *insn | | comedi_insn *insn |
| unsigned int *data | | unsigned int *data |
@ -2420,7 +2420,7 @@ int i_APCI3120_InsnReadDigitalInput(comedi_device * dev, comedi_subdevice
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI3120_InsnBitsDigitalInput(comedi_device * dev, comedi_subdevice * s, int i_APCI3120_InsnBitsDigitalInput(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
UINT ui_TmpValue; UINT ui_TmpValue;
@ -2442,14 +2442,14 @@ int i_APCI3120_InsnBitsDigitalInput(comedi_device * dev, comedi_subdevice * s,
*/ */
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function name :int i_APCI3120_InsnConfigDigitalOutput(comedi_device | | Function name :int i_APCI3120_InsnConfigDigitalOutput(struct comedi_device |
| *dev,comedi_subdevice *s,comedi_insn *insn,unsigned int *data) | | *dev,comedi_subdevice *s,comedi_insn *insn,unsigned int *data) |
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task :Configure the output memory ON or OFF | | Task :Configure the output memory ON or OFF |
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters :comedi_device *dev | | Input Parameters :struct comedi_device *dev |
| comedi_subdevice *s | | comedi_subdevice *s |
| comedi_insn *insn | | comedi_insn *insn |
| unsigned int *data | | unsigned int *data |
@ -2459,7 +2459,7 @@ int i_APCI3120_InsnBitsDigitalInput(comedi_device * dev, comedi_subdevice * s,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI3120_InsnConfigDigitalOutput(comedi_device * dev, int i_APCI3120_InsnConfigDigitalOutput(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
@ -2485,14 +2485,14 @@ int i_APCI3120_InsnConfigDigitalOutput(comedi_device * dev,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function name :int i_APCI3120_InsnBitsDigitalOutput(comedi_device *dev, | | Function name :int i_APCI3120_InsnBitsDigitalOutput(struct comedi_device *dev, |
| comedi_subdevice *s, comedi_insn *insn,unsigned int *data) | | comedi_subdevice *s, comedi_insn *insn,unsigned int *data) |
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : write diatal output port | | Task : write diatal output port |
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev | | Input Parameters : struct comedi_device *dev |
| comedi_subdevice *s | | comedi_subdevice *s |
| comedi_insn *insn | | comedi_insn *insn |
| unsigned int *data | | unsigned int *data |
@ -2505,7 +2505,7 @@ int i_APCI3120_InsnConfigDigitalOutput(comedi_device * dev,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI3120_InsnBitsDigitalOutput(comedi_device * dev, comedi_subdevice int i_APCI3120_InsnBitsDigitalOutput(struct comedi_device * dev, comedi_subdevice
* s, comedi_insn * insn, unsigned int * data) * s, comedi_insn * insn, unsigned int * data)
{ {
if ((data[0] > this_board->i_DoMaxdata) || (data[0] < 0)) { if ((data[0] > this_board->i_DoMaxdata) || (data[0] < 0)) {
@ -2536,14 +2536,14 @@ int i_APCI3120_InsnBitsDigitalOutput(comedi_device * dev, comedi_subdevice
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function name :int i_APCI3120_InsnWriteDigitalOutput(comedi_device *dev,| | Function name :int i_APCI3120_InsnWriteDigitalOutput(struct comedi_device *dev,|
|comedi_subdevice *s,comedi_insn *insn,unsigned int *data) | |comedi_subdevice *s,comedi_insn *insn,unsigned int *data) |
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Write digiatl output | | Task : Write digiatl output |
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev | | Input Parameters : struct comedi_device *dev |
| comedi_subdevice *s | | comedi_subdevice *s |
| comedi_insn *insn | | comedi_insn *insn |
| unsigned int *data | | unsigned int *data |
@ -2556,7 +2556,7 @@ int i_APCI3120_InsnBitsDigitalOutput(comedi_device * dev, comedi_subdevice
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI3120_InsnWriteDigitalOutput(comedi_device * dev, comedi_subdevice int i_APCI3120_InsnWriteDigitalOutput(struct comedi_device * dev, comedi_subdevice
* s, comedi_insn * insn, unsigned int * data) * s, comedi_insn * insn, unsigned int * data)
{ {
@ -2617,14 +2617,14 @@ int i_APCI3120_InsnWriteDigitalOutput(comedi_device * dev, comedi_subdevice
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function name :int i_APCI3120_InsnWriteAnalogOutput(comedi_device *dev,| | Function name :int i_APCI3120_InsnWriteAnalogOutput(struct comedi_device *dev,|
|comedi_subdevice *s, comedi_insn *insn,unsigned int *data) | |comedi_subdevice *s, comedi_insn *insn,unsigned int *data) |
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Write analog output | | Task : Write analog output |
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev | | Input Parameters : struct comedi_device *dev |
| comedi_subdevice *s | | comedi_subdevice *s |
| comedi_insn *insn | | comedi_insn *insn |
| unsigned int *data | | unsigned int *data |
@ -2634,7 +2634,7 @@ int i_APCI3120_InsnWriteDigitalOutput(comedi_device * dev, comedi_subdevice
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI3120_InsnWriteAnalogOutput(comedi_device * dev, comedi_subdevice int i_APCI3120_InsnWriteAnalogOutput(struct comedi_device * dev, comedi_subdevice
* s, comedi_insn * insn, unsigned int * data) * s, comedi_insn * insn, unsigned int * data)
{ {
UINT ui_Range, ui_Channel; UINT ui_Range, ui_Channel;

52
drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.h
View File

@ -178,64 +178,64 @@ typedef struct {
// Function Declaration For APCI-3120 // Function Declaration For APCI-3120
// Internal functions // Internal functions
int i_APCI3120_SetupChannelList(comedi_device *dev, comedi_subdevice *s, int i_APCI3120_SetupChannelList(struct comedi_device *dev, comedi_subdevice *s,
int n_chan, unsigned int *chanlist, char check); int n_chan, unsigned int *chanlist, char check);
int i_APCI3120_ExttrigEnable(comedi_device *dev); int i_APCI3120_ExttrigEnable(struct comedi_device *dev);
int i_APCI3120_ExttrigDisable(comedi_device *dev); int i_APCI3120_ExttrigDisable(struct comedi_device *dev);
int i_APCI3120_StopCyclicAcquisition(comedi_device *dev, comedi_subdevice *s); int i_APCI3120_StopCyclicAcquisition(struct comedi_device *dev, comedi_subdevice *s);
int i_APCI3120_Reset(comedi_device *dev); int i_APCI3120_Reset(struct comedi_device *dev);
int i_APCI3120_CyclicAnalogInput(int mode, comedi_device *dev, int i_APCI3120_CyclicAnalogInput(int mode, struct comedi_device *dev,
comedi_subdevice *s); 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(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,comedi_subdevice *s,short *dma,short *data,int n);
void v_APCI3120_InterruptDmaMoveBlock16bit(comedi_device *dev, void v_APCI3120_InterruptDmaMoveBlock16bit(struct comedi_device *dev,
comedi_subdevice *s, comedi_subdevice *s,
short *dma_buffer, short *dma_buffer,
unsigned int num_samples); unsigned int num_samples);
int i_APCI3120_InterruptHandleEos(comedi_device *dev); int i_APCI3120_InterruptHandleEos(struct comedi_device *dev);
void v_APCI3120_InterruptDma(int irq, void *d); void v_APCI3120_InterruptDma(int irq, void *d);
// TIMER // TIMER
int i_APCI3120_InsnConfigTimer(comedi_device *dev, comedi_subdevice *s, int i_APCI3120_InsnConfigTimer(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
int i_APCI3120_InsnWriteTimer(comedi_device *dev, comedi_subdevice *s, int i_APCI3120_InsnWriteTimer(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
int i_APCI3120_InsnReadTimer(comedi_device *dev, comedi_subdevice *s, int i_APCI3120_InsnReadTimer(struct comedi_device *dev, 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(comedi_device *dev, comedi_subdevice *s, int i_APCI3120_InsnBitsDigitalInput(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
int i_APCI3120_InsnReadDigitalInput(comedi_device *dev, comedi_subdevice *s, int i_APCI3120_InsnReadDigitalInput(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
//DO //DO
//int i_APCI3120_WriteDigitalOutput(comedi_device *dev, BYTE data); //int i_APCI3120_WriteDigitalOutput(struct comedi_device *dev, BYTE data);
int i_APCI3120_InsnConfigDigitalOutput(comedi_device *dev, int i_APCI3120_InsnConfigDigitalOutput(struct comedi_device *dev,
comedi_subdevice *s, comedi_insn *insn, comedi_subdevice *s, comedi_insn *insn,
unsigned int *data); unsigned int *data);
int i_APCI3120_InsnBitsDigitalOutput(comedi_device *dev, comedi_subdevice *s, int i_APCI3120_InsnBitsDigitalOutput(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
int i_APCI3120_InsnWriteDigitalOutput(comedi_device *dev, comedi_subdevice *s, int i_APCI3120_InsnWriteDigitalOutput(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
//AO //AO
//int i_APCI3120_Write1AnalogValue(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(comedi_device *dev, comedi_subdevice *s, int i_APCI3120_InsnWriteAnalogOutput(struct comedi_device *dev, 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(comedi_device *dev, comedi_subdevice *s, int i_APCI3120_InsnConfigAnalogInput(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
int i_APCI3120_InsnReadAnalogInput(comedi_device *dev, comedi_subdevice *s, int i_APCI3120_InsnReadAnalogInput(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
int i_APCI3120_CommandTestAnalogInput(comedi_device *dev, comedi_subdevice *s, int i_APCI3120_CommandTestAnalogInput(struct comedi_device *dev, comedi_subdevice *s,
comedi_cmd *cmd); comedi_cmd *cmd);
int i_APCI3120_CommandAnalogInput(comedi_device *dev, comedi_subdevice *s); int i_APCI3120_CommandAnalogInput(struct comedi_device *dev, comedi_subdevice *s);
//int i_APCI3120_CancelAnalogInput(comedi_device *dev, comedi_subdevice *s); //int i_APCI3120_CancelAnalogInput(struct comedi_device *dev, comedi_subdevice *s);
int i_APCI3120_StopCyclicAcquisition(comedi_device *dev, comedi_subdevice *s); int i_APCI3120_StopCyclicAcquisition(struct comedi_device *dev, comedi_subdevice *s);

116
drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c
View File

@ -453,7 +453,7 @@ VOID v_GetAPCI3200EepromCalibrationValue(DWORD dw_PCIBoardEepromAddress,
} }
} }
INT i_APCI3200_GetChannelCalibrationValue(comedi_device * dev, INT i_APCI3200_GetChannelCalibrationValue(struct comedi_device * dev,
unsigned int ui_Channel_num, unsigned int * CJCCurrentSource, unsigned int ui_Channel_num, unsigned int * CJCCurrentSource,
unsigned int * ChannelCurrentSource, unsigned int * ChannelGainFactor) unsigned int * ChannelCurrentSource, unsigned int * ChannelGainFactor)
{ {
@ -530,12 +530,12 @@ INT i_APCI3200_GetChannelCalibrationValue(comedi_device * dev,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI3200_ReadDigitalInput | | Function Name : int i_APCI3200_ReadDigitalInput |
| (comedi_device *dev,comedi_subdevice *s, | | (struct comedi_device *dev,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 |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| UINT ui_NoOfChannels : No Of Channels To read for Port | UINT ui_NoOfChannels : No Of Channels To read for Port
Channel Numberfor single channel Channel Numberfor single channel
| UINT data[0] : 0: Read single channel | UINT data[0] : 0: Read single channel
@ -550,7 +550,7 @@ INT i_APCI3200_GetChannelCalibrationValue(comedi_device * dev,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI3200_ReadDigitalInput(comedi_device * dev, comedi_subdevice * s, INT i_APCI3200_ReadDigitalInput(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
UINT ui_Temp = 0; UINT ui_Temp = 0;
@ -592,12 +592,12 @@ INT i_APCI3200_ReadDigitalInput(comedi_device * dev, comedi_subdevice * s,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI3200_ConfigDigitalOutput | | Function Name : int i_APCI3200_ConfigDigitalOutput |
| (comedi_device *dev,comedi_subdevice *s, | | (struct comedi_device *dev,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. |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| data[0] :1 Memory enable | data[0] :1 Memory enable
0 Memory Disable 0 Memory Disable
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@ -608,7 +608,7 @@ INT i_APCI3200_ReadDigitalInput(comedi_device * dev, comedi_subdevice * s,
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI3200_ConfigDigitalOutput(comedi_device * dev, comedi_subdevice * s, int i_APCI3200_ConfigDigitalOutput(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
@ -629,12 +629,12 @@ int i_APCI3200_ConfigDigitalOutput(comedi_device * dev, comedi_subdevice * s,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI3200_WriteDigitalOutput | | Function Name : int i_APCI3200_WriteDigitalOutput |
| (comedi_device *dev,comedi_subdevice *s, | | (struct comedi_device *dev,comedi_subdevice *s, |
| comedi_insn *insn,unsigned int *data) | | comedi_insn *insn,unsigned int *data) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : writes To the digital Output Subdevice | | Task : writes To the digital Output Subdevice |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| comedi_subdevice *s : Subdevice Pointer | | 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 |
@ -653,7 +653,7 @@ int i_APCI3200_ConfigDigitalOutput(comedi_device * dev, comedi_subdevice * s,
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI3200_WriteDigitalOutput(comedi_device * dev, comedi_subdevice * s, INT i_APCI3200_WriteDigitalOutput(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
UINT ui_Temp = 0, ui_Temp1 = 0; UINT ui_Temp = 0, ui_Temp1 = 0;
@ -746,12 +746,12 @@ INT i_APCI3200_WriteDigitalOutput(comedi_device * dev, comedi_subdevice * s,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI3200_ReadDigitalOutput | | Function Name : int i_APCI3200_ReadDigitalOutput |
| (comedi_device *dev,comedi_subdevice *s, | | (struct comedi_device *dev,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 |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| UINT ui_NoOfChannels : No Of Channels To read | | UINT ui_NoOfChannels : No Of Channels To read |
| UINT *data : Data Pointer to read status | | UINT *data : Data Pointer to read status |
data[0] :0 read single channel data[0] :0 read single channel
@ -766,7 +766,7 @@ INT i_APCI3200_WriteDigitalOutput(comedi_device * dev, comedi_subdevice * s,
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI3200_ReadDigitalOutput(comedi_device * dev, comedi_subdevice * s, INT i_APCI3200_ReadDigitalOutput(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
UINT ui_Temp; UINT ui_Temp;
@ -807,12 +807,12 @@ INT i_APCI3200_ReadDigitalOutput(comedi_device * dev, comedi_subdevice * s,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : INT i_APCI3200_ConfigAnalogInput | | Function Name : INT i_APCI3200_ConfigAnalogInput |
| (comedi_device *dev,comedi_subdevice *s, | | (struct comedi_device *dev,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 : comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| comedi_subdevice *s : Subdevice Pointer | | 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 |
@ -874,7 +874,7 @@ INT i_APCI3200_ReadDigitalOutput(comedi_device * dev, comedi_subdevice * s,
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI3200_ConfigAnalogInput(comedi_device * dev, comedi_subdevice * s, INT i_APCI3200_ConfigAnalogInput(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
@ -1334,12 +1334,12 @@ INT i_APCI3200_ConfigAnalogInput(comedi_device * dev, comedi_subdevice * s,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI3200_ReadAnalogInput | | Function Name : int i_APCI3200_ReadAnalogInput |
| (comedi_device *dev,comedi_subdevice *s, | | (struct comedi_device *dev,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 |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| UINT ui_NoOfChannels : No Of Channels To read | | UINT ui_NoOfChannels : No Of Channels To read |
| UINT *data : Data Pointer to read status | | UINT *data : Data Pointer to read status |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@ -1361,7 +1361,7 @@ INT i_APCI3200_ConfigAnalogInput(comedi_device * dev, comedi_subdevice * s,
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI3200_ReadAnalogInput(comedi_device * dev, comedi_subdevice * s, INT i_APCI3200_ReadAnalogInput(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
UINT ui_DummyValue = 0; UINT ui_DummyValue = 0;
@ -1633,12 +1633,12 @@ INT i_APCI3200_ReadAnalogInput(comedi_device * dev, comedi_subdevice * s,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI3200_Read1AnalogInputChannel | | Function Name : int i_APCI3200_Read1AnalogInputChannel |
| (comedi_device *dev,comedi_subdevice *s, | | (struct comedi_device *dev,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 |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| UINT ui_NoOfChannel : Channel No to read | | UINT ui_NoOfChannel : Channel No to read |
| UINT *data : Data Pointer to read status | | UINT *data : Data Pointer to read status |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@ -1651,7 +1651,7 @@ INT i_APCI3200_ReadAnalogInput(comedi_device * dev, comedi_subdevice * s,
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI3200_Read1AnalogInputChannel(comedi_device * dev, INT i_APCI3200_Read1AnalogInputChannel(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
UINT ui_EOC = 0; UINT ui_EOC = 0;
@ -1759,12 +1759,12 @@ INT i_APCI3200_Read1AnalogInputChannel(comedi_device * dev,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI3200_ReadCalibrationOffsetValue | | Function Name : int i_APCI3200_ReadCalibrationOffsetValue |
| (comedi_device *dev,comedi_subdevice *s, | | (struct comedi_device *dev,comedi_subdevice *s, |
| comedi_insn *insn,unsigned int *data) | | comedi_insn *insn,unsigned int *data) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Read calibration offset value of the selected channel| | Task : Read calibration offset value of the selected channel|
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| UINT *data : Data Pointer to read status | | UINT *data : Data Pointer to read status |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Output Parameters : -- | | Output Parameters : -- |
@ -1776,7 +1776,7 @@ INT i_APCI3200_Read1AnalogInputChannel(comedi_device * dev,
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI3200_ReadCalibrationOffsetValue(comedi_device * dev, UINT * data) int i_APCI3200_ReadCalibrationOffsetValue(struct comedi_device * dev, UINT * data)
{ {
UINT ui_Temp = 0, ui_EOC = 0; UINT ui_Temp = 0, ui_EOC = 0;
UINT ui_CommandRegister = 0; UINT ui_CommandRegister = 0;
@ -1895,12 +1895,12 @@ int i_APCI3200_ReadCalibrationOffsetValue(comedi_device * dev, UINT * data)
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI3200_ReadCalibrationGainValue | | Function Name : int i_APCI3200_ReadCalibrationGainValue |
| (comedi_device *dev,comedi_subdevice *s, | | (struct comedi_device *dev,comedi_subdevice *s, |
| comedi_insn *insn,unsigned int *data) | | comedi_insn *insn,unsigned int *data) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Read calibration gain value of the selected channel | | Task : Read calibration gain value of the selected channel |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| UINT *data : Data Pointer to read status | | UINT *data : Data Pointer to read status |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Output Parameters : -- | | Output Parameters : -- |
@ -1912,7 +1912,7 @@ int i_APCI3200_ReadCalibrationOffsetValue(comedi_device * dev, UINT * data)
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI3200_ReadCalibrationGainValue(comedi_device * dev, UINT * data) int i_APCI3200_ReadCalibrationGainValue(struct comedi_device * dev, UINT * data)
{ {
UINT ui_EOC = 0; UINT ui_EOC = 0;
INT ui_CommandRegister = 0; INT ui_CommandRegister = 0;
@ -2030,12 +2030,12 @@ int i_APCI3200_ReadCalibrationGainValue(comedi_device * dev, UINT * data)
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI3200_ReadCJCValue | | Function Name : int i_APCI3200_ReadCJCValue |
| (comedi_device *dev,comedi_subdevice *s, | | (struct comedi_device *dev,comedi_subdevice *s, |
| comedi_insn *insn,unsigned int *data) | | comedi_insn *insn,unsigned int *data) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Read CJC value of the selected channel | | Task : Read CJC value of the selected channel |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| UINT *data : Data Pointer to read status | | UINT *data : Data Pointer to read status |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Output Parameters : -- | | Output Parameters : -- |
@ -2048,7 +2048,7 @@ int i_APCI3200_ReadCalibrationGainValue(comedi_device * dev, UINT * data)
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI3200_ReadCJCValue(comedi_device * dev, unsigned int * data) int i_APCI3200_ReadCJCValue(struct comedi_device * dev, unsigned int * data)
{ {
UINT ui_EOC = 0; UINT ui_EOC = 0;
INT ui_CommandRegister = 0; INT ui_CommandRegister = 0;
@ -2150,12 +2150,12 @@ int i_APCI3200_ReadCJCValue(comedi_device * dev, unsigned int * data)
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI3200_ReadCJCCalOffset | | Function Name : int i_APCI3200_ReadCJCCalOffset |
| (comedi_device *dev,comedi_subdevice *s, | | (struct comedi_device *dev,comedi_subdevice *s, |
| comedi_insn *insn,unsigned int *data) | | comedi_insn *insn,unsigned int *data) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Read CJC calibration offset value of the selected channel | Task : Read CJC calibration offset value of the selected channel
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| UINT *data : Data Pointer to read status | | UINT *data : Data Pointer to read status |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Output Parameters : -- | | Output Parameters : -- |
@ -2167,7 +2167,7 @@ int i_APCI3200_ReadCJCValue(comedi_device * dev, unsigned int * data)
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI3200_ReadCJCCalOffset(comedi_device * dev, unsigned int * data) int i_APCI3200_ReadCJCCalOffset(struct comedi_device * dev, unsigned int * data)
{ {
UINT ui_EOC = 0; UINT ui_EOC = 0;
INT ui_CommandRegister = 0; INT ui_CommandRegister = 0;
@ -2265,12 +2265,12 @@ int i_APCI3200_ReadCJCCalOffset(comedi_device * dev, unsigned int * data)
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI3200_ReadCJCGainValue | | Function Name : int i_APCI3200_ReadCJCGainValue |
| (comedi_device *dev,comedi_subdevice *s, | | (struct comedi_device *dev,comedi_subdevice *s, |
| comedi_insn *insn,unsigned int *data) | | comedi_insn *insn,unsigned int *data) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Read CJC calibration gain value | Task : Read CJC calibration gain value
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| UINT ui_NoOfChannels : No Of Channels To read | | UINT ui_NoOfChannels : No Of Channels To read |
| UINT *data : Data Pointer to read status | | UINT *data : Data Pointer to read status |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@ -2283,7 +2283,7 @@ int i_APCI3200_ReadCJCCalOffset(comedi_device * dev, unsigned int * data)
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI3200_ReadCJCCalGain(comedi_device * dev, unsigned int * data) int i_APCI3200_ReadCJCCalGain(struct comedi_device * dev, unsigned int * data)
{ {
UINT ui_EOC = 0; UINT ui_EOC = 0;
INT ui_CommandRegister = 0; INT ui_CommandRegister = 0;
@ -2375,12 +2375,12 @@ int i_APCI3200_ReadCJCCalGain(comedi_device * dev, unsigned int * data)
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI3200_InsnBits_AnalogInput_Test | | Function Name : int i_APCI3200_InsnBits_AnalogInput_Test |
| (comedi_device *dev,comedi_subdevice *s, | | (struct comedi_device *dev,comedi_subdevice *s, |
| comedi_insn *insn,unsigned int *data) | | comedi_insn *insn,unsigned int *data) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Tests the Selected Anlog Input Channel | | Task : Tests the Selected Anlog Input Channel |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| comedi_subdevice *s : Subdevice Pointer | | 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 |
@ -2404,7 +2404,7 @@ int i_APCI3200_ReadCJCCalGain(comedi_device * dev, unsigned int * data)
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI3200_InsnBits_AnalogInput_Test(comedi_device * dev, INT i_APCI3200_InsnBits_AnalogInput_Test(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
UINT ui_Configuration = 0; UINT ui_Configuration = 0;
@ -2510,12 +2510,12 @@ INT i_APCI3200_InsnBits_AnalogInput_Test(comedi_device * dev,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI3200_InsnWriteReleaseAnalogInput | | Function Name : int i_APCI3200_InsnWriteReleaseAnalogInput |
| (comedi_device *dev,comedi_subdevice *s, | | (struct comedi_device *dev,comedi_subdevice *s, |
| comedi_insn *insn,unsigned int *data) | | comedi_insn *insn,unsigned int *data) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Resets the channels | | Task : Resets the channels |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| comedi_subdevice *s : Subdevice Pointer | | comedi_subdevice *s : Subdevice Pointer |
| comedi_insn *insn : Insn Structure Pointer | | comedi_insn *insn : Insn Structure Pointer |
| unsigned int *data : Data Pointer | unsigned int *data : Data Pointer
@ -2529,7 +2529,7 @@ INT i_APCI3200_InsnBits_AnalogInput_Test(comedi_device * dev,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI3200_InsnWriteReleaseAnalogInput(comedi_device * dev, INT i_APCI3200_InsnWriteReleaseAnalogInput(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
i_APCI3200_Reset(dev); i_APCI3200_Reset(dev);
@ -2538,7 +2538,7 @@ INT i_APCI3200_InsnWriteReleaseAnalogInput(comedi_device * dev,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function name :int i_APCI3200_CommandTestAnalogInput(comedi_device *dev| | Function name :int i_APCI3200_CommandTestAnalogInput(struct comedi_device *dev|
| ,comedi_subdevice *s,comedi_cmd *cmd) | | ,comedi_subdevice *s,comedi_cmd *cmd) |
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@ -2546,7 +2546,7 @@ INT i_APCI3200_InsnWriteReleaseAnalogInput(comedi_device * dev,
| acquisition | | acquisition |
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev | | Input Parameters : struct comedi_device *dev |
| comedi_subdevice *s | | comedi_subdevice *s |
| comedi_cmd *cmd | | comedi_cmd *cmd |
| | | |
@ -2560,7 +2560,7 @@ INT i_APCI3200_InsnWriteReleaseAnalogInput(comedi_device * dev,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI3200_CommandTestAnalogInput(comedi_device * dev, comedi_subdevice * s, int i_APCI3200_CommandTestAnalogInput(struct comedi_device * dev, comedi_subdevice * s,
comedi_cmd * cmd) comedi_cmd * cmd)
{ {
@ -2748,14 +2748,14 @@ int i_APCI3200_CommandTestAnalogInput(comedi_device * dev, comedi_subdevice * s,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function name :int i_APCI3200_StopCyclicAcquisition(comedi_device *dev,| | Function name :int i_APCI3200_StopCyclicAcquisition(struct comedi_device *dev,|
| comedi_subdevice *s)| | comedi_subdevice *s)|
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Stop the acquisition | | Task : Stop the acquisition |
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev | | Input Parameters : struct comedi_device *dev |
| comedi_subdevice *s | | comedi_subdevice *s |
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@ -2764,7 +2764,7 @@ int i_APCI3200_CommandTestAnalogInput(comedi_device * dev, comedi_subdevice * s,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI3200_StopCyclicAcquisition(comedi_device * dev, comedi_subdevice * s) int i_APCI3200_StopCyclicAcquisition(struct comedi_device * dev, comedi_subdevice * s)
{ {
UINT ui_Configuration = 0; UINT ui_Configuration = 0;
//i_InterruptFlag=0; //i_InterruptFlag=0;
@ -2796,7 +2796,7 @@ int i_APCI3200_StopCyclicAcquisition(comedi_device * dev, comedi_subdevice * s)
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function name : int i_APCI3200_CommandAnalogInput(comedi_device *dev, | | Function name : int i_APCI3200_CommandAnalogInput(struct comedi_device *dev, |
| comedi_subdevice *s) | | comedi_subdevice *s) |
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@ -2804,7 +2804,7 @@ int i_APCI3200_StopCyclicAcquisition(comedi_device * dev, comedi_subdevice * s)
| Determines the mode 1 or 2. | | Determines the mode 1 or 2. |
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev | | Input Parameters : struct comedi_device *dev |
| comedi_subdevice *s | | comedi_subdevice *s |
| | | |
| | | |
@ -2814,7 +2814,7 @@ int i_APCI3200_StopCyclicAcquisition(comedi_device * dev, comedi_subdevice * s)
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI3200_CommandAnalogInput(comedi_device * dev, comedi_subdevice * s) int i_APCI3200_CommandAnalogInput(struct comedi_device * dev, comedi_subdevice * s)
{ {
comedi_cmd *cmd = &s->async->cmd; comedi_cmd *cmd = &s->async->cmd;
UINT ui_Configuration = 0; UINT ui_Configuration = 0;
@ -2987,7 +2987,7 @@ int i_APCI3200_CommandAnalogInput(comedi_device * dev, comedi_subdevice * s)
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI3200_Reset(comedi_device *dev) | | Function Name : int i_APCI3200_Reset(struct comedi_device *dev) |
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task :Resets the registers of the card | | Task :Resets the registers of the card |
@ -3001,7 +3001,7 @@ int i_APCI3200_CommandAnalogInput(comedi_device * dev, comedi_subdevice * s)
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI3200_Reset(comedi_device * dev) int i_APCI3200_Reset(struct comedi_device * dev)
{ {
INT i_Temp; INT i_Temp;
DWORD dw_Dummy; DWORD dw_Dummy;
@ -3059,7 +3059,7 @@ int i_APCI3200_Reset(comedi_device * dev)
*/ */
void v_APCI3200_Interrupt(int irq, void *d) void v_APCI3200_Interrupt(int irq, void *d)
{ {
comedi_device *dev = d; struct comedi_device *dev = d;
UINT ui_StatusRegister = 0; UINT ui_StatusRegister = 0;
UINT ui_ChannelNumber = 0; UINT ui_ChannelNumber = 0;
INT i_CalibrationFlag = 0; INT i_CalibrationFlag = 0;
@ -3482,7 +3482,7 @@ void v_APCI3200_Interrupt(int irq, void *d)
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function name :int i_APCI3200_InterruptHandleEos(comedi_device *dev) | | Function name :int i_APCI3200_InterruptHandleEos(struct comedi_device *dev) |
| | | |
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@ -3491,7 +3491,7 @@ void v_APCI3200_Interrupt(int irq, void *d)
| to Comedi buffer. | | to Comedi buffer. |
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev | | Input Parameters : struct comedi_device *dev |
| | | |
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@ -3499,7 +3499,7 @@ void v_APCI3200_Interrupt(int irq, void *d)
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI3200_InterruptHandleEos(comedi_device * dev) int i_APCI3200_InterruptHandleEos(struct comedi_device * dev)
{ {
UINT ui_StatusRegister = 0; UINT ui_StatusRegister = 0;
comedi_subdevice *s = dev->subdevices + 0; comedi_subdevice *s = dev->subdevices + 0;

34
drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.h
View File

@ -154,34 +154,34 @@ typedef struct {
//AI //AI
INT i_APCI3200_ConfigAnalogInput(comedi_device *dev, comedi_subdevice *s, INT i_APCI3200_ConfigAnalogInput(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
INT i_APCI3200_ReadAnalogInput(comedi_device *dev, comedi_subdevice *s, INT i_APCI3200_ReadAnalogInput(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
INT i_APCI3200_InsnWriteReleaseAnalogInput(comedi_device *dev, INT i_APCI3200_InsnWriteReleaseAnalogInput(struct comedi_device *dev,
comedi_subdevice *s, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
INT i_APCI3200_InsnBits_AnalogInput_Test(comedi_device *dev, INT i_APCI3200_InsnBits_AnalogInput_Test(struct comedi_device *dev,
comedi_subdevice *s, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
INT i_APCI3200_StopCyclicAcquisition(comedi_device *dev, comedi_subdevice *s); INT i_APCI3200_StopCyclicAcquisition(struct comedi_device *dev, comedi_subdevice *s);
INT i_APCI3200_InterruptHandleEos(comedi_device *dev); INT i_APCI3200_InterruptHandleEos(struct comedi_device *dev);
INT i_APCI3200_CommandTestAnalogInput(comedi_device *dev, comedi_subdevice *s, INT i_APCI3200_CommandTestAnalogInput(struct comedi_device *dev, comedi_subdevice *s,
comedi_cmd *cmd); comedi_cmd *cmd);
INT i_APCI3200_CommandAnalogInput(comedi_device *dev, comedi_subdevice *s); INT i_APCI3200_CommandAnalogInput(struct comedi_device *dev, comedi_subdevice *s);
INT i_APCI3200_ReadDigitalInput(comedi_device *dev, comedi_subdevice *s, INT i_APCI3200_ReadDigitalInput(struct comedi_device *dev, 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);
int i_APCI3200_InterruptHandleEos(comedi_device *dev); int i_APCI3200_InterruptHandleEos(struct comedi_device *dev);
//Reset functions //Reset functions
INT i_APCI3200_Reset(comedi_device *dev); INT i_APCI3200_Reset(struct comedi_device *dev);
int i_APCI3200_ReadCJCCalOffset(comedi_device *dev, unsigned int *data); int i_APCI3200_ReadCJCCalOffset(struct comedi_device *dev, unsigned int *data);
int i_APCI3200_ReadCJCValue(comedi_device *dev, unsigned int *data); int i_APCI3200_ReadCJCValue(struct comedi_device *dev, unsigned int *data);
int i_APCI3200_ReadCalibrationGainValue(comedi_device *dev, UINT *data); int i_APCI3200_ReadCalibrationGainValue(struct comedi_device *dev, UINT *data);
int i_APCI3200_ReadCalibrationOffsetValue(comedi_device *dev, UINT *data); int i_APCI3200_ReadCalibrationOffsetValue(struct comedi_device *dev, UINT *data);
int i_APCI3200_Read1AnalogInputChannel(comedi_device *dev, int i_APCI3200_Read1AnalogInputChannel(struct comedi_device *dev,
comedi_subdevice *s, comedi_insn *insn, comedi_subdevice *s, comedi_insn *insn,
unsigned int *data); unsigned int *data);
int i_APCI3200_ReadCJCCalGain(comedi_device *dev, unsigned int *data); int i_APCI3200_ReadCJCCalGain(struct comedi_device *dev, unsigned int *data);

60
drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c
View File

@ -56,12 +56,12 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI3501_ReadDigitalInput | | Function Name : int i_APCI3501_ReadDigitalInput |
| (comedi_device *dev,comedi_subdevice *s, | | (struct comedi_device *dev,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 |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| UINT ui_NoOfChannels : No Of Channels To read | | UINT ui_NoOfChannels : No Of Channels To read |
| UINT *data : Data Pointer to read status | | UINT *data : Data Pointer to read status |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@ -73,7 +73,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI3501_ReadDigitalInput(comedi_device * dev, comedi_subdevice * s, INT i_APCI3501_ReadDigitalInput(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
UINT ui_Temp; UINT ui_Temp;
@ -99,12 +99,12 @@ INT i_APCI3501_ReadDigitalInput(comedi_device * dev, comedi_subdevice * s,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI3501_ConfigDigitalOutput | | Function Name : int i_APCI3501_ConfigDigitalOutput |
| (comedi_device *dev,comedi_subdevice *s, | | (struct comedi_device *dev,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. |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| UINT *data : Data Pointer contains | | UINT *data : Data Pointer contains |
| configuration parameters as below | | configuration parameters as below |
| | | |
@ -121,7 +121,7 @@ INT i_APCI3501_ReadDigitalInput(comedi_device * dev, comedi_subdevice * s,
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI3501_ConfigDigitalOutput(comedi_device * dev, comedi_subdevice * s, int i_APCI3501_ConfigDigitalOutput(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
@ -142,12 +142,12 @@ int i_APCI3501_ConfigDigitalOutput(comedi_device * dev, comedi_subdevice * s,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI3501_WriteDigitalOutput | | Function Name : int i_APCI3501_WriteDigitalOutput |
| (comedi_device *dev,comedi_subdevice *s, | | (struct comedi_device *dev,comedi_subdevice *s, |
| comedi_insn *insn,unsigned int *data) | | comedi_insn *insn,unsigned int *data) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : writes To the digital Output Subdevice | | Task : writes To the digital Output Subdevice |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| comedi_subdevice *s : Subdevice Pointer | | 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 |
@ -161,7 +161,7 @@ int i_APCI3501_ConfigDigitalOutput(comedi_device * dev, comedi_subdevice * s,
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI3501_WriteDigitalOutput(comedi_device * dev, comedi_subdevice * s, INT i_APCI3501_WriteDigitalOutput(struct comedi_device * dev, 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;
@ -232,12 +232,12 @@ INT i_APCI3501_WriteDigitalOutput(comedi_device * dev, comedi_subdevice * s,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI3501_ReadDigitalOutput | | Function Name : int i_APCI3501_ReadDigitalOutput |
| (comedi_device *dev,comedi_subdevice *s, | | (struct comedi_device *dev,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 |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| UINT ui_NoOfChannels : No Of Channels To read | | UINT ui_NoOfChannels : No Of Channels To read |
| UINT *data : Data Pointer to read status | | UINT *data : Data Pointer to read status |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@ -248,7 +248,7 @@ INT i_APCI3501_WriteDigitalOutput(comedi_device * dev, comedi_subdevice * s,
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI3501_ReadDigitalOutput(comedi_device * dev, comedi_subdevice * s, INT i_APCI3501_ReadDigitalOutput(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
UINT ui_Temp; UINT ui_Temp;
@ -275,12 +275,12 @@ INT i_APCI3501_ReadDigitalOutput(comedi_device * dev, comedi_subdevice * s,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI3501_ConfigAnalogOutput | | Function Name : int i_APCI3501_ConfigAnalogOutput |
| (comedi_device *dev,comedi_subdevice *s, | | (struct comedi_device *dev,comedi_subdevice *s, |
| comedi_insn *insn,unsigned int *data) | | comedi_insn *insn,unsigned int *data) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Configures The Analog Output Subdevice | | Task : Configures The Analog Output Subdevice |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| comedi_subdevice *s : Subdevice Pointer | | 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 |
@ -298,7 +298,7 @@ INT i_APCI3501_ReadDigitalOutput(comedi_device * dev, comedi_subdevice * s,
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI3501_ConfigAnalogOutput(comedi_device * dev, comedi_subdevice * s, INT i_APCI3501_ConfigAnalogOutput(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
outl(data[0], outl(data[0],
@ -316,12 +316,12 @@ INT i_APCI3501_ConfigAnalogOutput(comedi_device * dev, comedi_subdevice * s,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI3501_WriteAnalogOutput | | Function Name : int i_APCI3501_WriteAnalogOutput |
| (comedi_device *dev,comedi_subdevice *s, | | (struct comedi_device *dev,comedi_subdevice *s, |
| comedi_insn *insn,unsigned int *data) | | comedi_insn *insn,unsigned int *data) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Writes To the Selected Anlog Output Channel | | Task : Writes To the Selected Anlog Output Channel |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| comedi_subdevice *s : Subdevice Pointer | | 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 |
@ -336,7 +336,7 @@ INT i_APCI3501_ConfigAnalogOutput(comedi_device * dev, comedi_subdevice * s,
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI3501_WriteAnalogOutput(comedi_device * dev, comedi_subdevice * s, INT i_APCI3501_WriteAnalogOutput(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
ULONG ul_Command1 = 0, ul_Channel_no, ul_Polarity, ul_DAC_Ready = 0;; ULONG ul_Command1 = 0, ul_Channel_no, ul_Polarity, ul_DAC_Ready = 0;;
@ -386,12 +386,12 @@ INT i_APCI3501_WriteAnalogOutput(comedi_device * dev, comedi_subdevice * s,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI3501_ConfigTimerCounterWatchdog | | Function Name : int i_APCI3501_ConfigTimerCounterWatchdog |
| (comedi_device *dev,comedi_subdevice *s, | | (struct comedi_device *dev,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 |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| UINT *data : Data Pointer contains | | UINT *data : Data Pointer contains |
| configuration parameters as below | | configuration parameters as below |
| | | |
@ -410,7 +410,7 @@ INT i_APCI3501_WriteAnalogOutput(comedi_device * dev, comedi_subdevice * s,
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_APCI3501_ConfigTimerCounterWatchdog(comedi_device * dev, INT i_APCI3501_ConfigTimerCounterWatchdog(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
ULONG ul_Command1 = 0; ULONG ul_Command1 = 0;
@ -489,12 +489,12 @@ INT i_APCI3501_ConfigTimerCounterWatchdog(comedi_device * dev,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI3501_StartStopWriteTimerCounterWatchdog | | Function Name : int i_APCI3501_StartStopWriteTimerCounterWatchdog |
| (comedi_device *dev,comedi_subdevice *s, | | (struct comedi_device *dev,comedi_subdevice *s, |
| comedi_insn *insn,unsigned int *data) | | comedi_insn *insn,unsigned int *data) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Start / Stop The Selected Timer , Counter or Watchdog | | Task : Start / Stop The Selected Timer , Counter or Watchdog |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| UINT *data : Data Pointer contains | | UINT *data : Data Pointer contains |
| configuration parameters as below | | configuration parameters as below |
| | | |
@ -511,7 +511,7 @@ INT i_APCI3501_ConfigTimerCounterWatchdog(comedi_device * dev,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI3501_StartStopWriteTimerCounterWatchdog(comedi_device * dev, int i_APCI3501_StartStopWriteTimerCounterWatchdog(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
ULONG ul_Command1 = 0; ULONG ul_Command1 = 0;
@ -592,12 +592,12 @@ int i_APCI3501_StartStopWriteTimerCounterWatchdog(comedi_device * dev,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI3501_ReadTimerCounterWatchdog | | Function Name : int i_APCI3501_ReadTimerCounterWatchdog |
| (comedi_device *dev,comedi_subdevice *s, | | (struct comedi_device *dev,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 |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev : Driver handle | | Input Parameters : struct comedi_device *dev : Driver handle |
| UINT *data : Data Pointer contains | | UINT *data : Data Pointer contains |
| configuration parameters as below | | configuration parameters as below |
| | | |
@ -613,7 +613,7 @@ int i_APCI3501_StartStopWriteTimerCounterWatchdog(comedi_device * dev,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI3501_ReadTimerCounterWatchdog(comedi_device * dev, int i_APCI3501_ReadTimerCounterWatchdog(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
@ -640,7 +640,7 @@ int i_APCI3501_ReadTimerCounterWatchdog(comedi_device * dev,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI3501_Reset(comedi_device *dev) | | Function Name : int i_APCI3501_Reset(struct comedi_device *dev) |
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task :Resets the registers of the card | | Task :Resets the registers of the card |
@ -654,7 +654,7 @@ int i_APCI3501_ReadTimerCounterWatchdog(comedi_device * dev,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI3501_Reset(comedi_device * dev) int i_APCI3501_Reset(struct comedi_device * dev)
{ {
int i_Count = 0, i_temp = 0; int i_Count = 0, i_temp = 0;
ULONG ul_Command1 = 0, ul_Polarity, ul_DAC_Ready = 0; ULONG ul_Command1 = 0, ul_Polarity, ul_DAC_Ready = 0;
@ -708,7 +708,7 @@ int i_APCI3501_Reset(comedi_device * dev)
void v_APCI3501_Interrupt(int irq, void *d) void v_APCI3501_Interrupt(int irq, void *d)
{ {
int i_temp; int i_temp;
comedi_device *dev = d; struct comedi_device *dev = d;
unsigned int ui_Timer_AOWatchdog; unsigned int ui_Timer_AOWatchdog;
unsigned long ul_Command1; unsigned long ul_Command1;
// Disable Interrupt // Disable Interrupt

22
drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.h
View File

@ -55,40 +55,40 @@ comedi_lrange range_apci3501_ao = { 2, {
// Hardware Layer functions for Apci3501 // Hardware Layer functions for Apci3501
//AO //AO
INT i_APCI3501_ConfigAnalogOutput(comedi_device *dev, comedi_subdevice *s, INT i_APCI3501_ConfigAnalogOutput(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
INT i_APCI3501_WriteAnalogOutput(comedi_device *dev, comedi_subdevice *s, INT i_APCI3501_WriteAnalogOutput(struct comedi_device *dev, 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(comedi_device *dev,comedi_subdevice *s,comedi_insn *insn,unsigned int *data); //INT i_APCI3501_ReadDigitalInput(struct comedi_device *dev,comedi_subdevice *s,comedi_insn *insn,unsigned int *data);
INT i_APCI3501_ReadDigitalInput(comedi_device *dev, comedi_subdevice *s, INT i_APCI3501_ReadDigitalInput(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
//DO //DO
int i_APCI3501_ConfigDigitalOutput(comedi_device *dev, comedi_subdevice *s, int i_APCI3501_ConfigDigitalOutput(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
INT i_APCI3501_WriteDigitalOutput(comedi_device *dev, comedi_subdevice *s, INT i_APCI3501_WriteDigitalOutput(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
INT i_APCI3501_ReadDigitalOutput(comedi_device *dev, comedi_subdevice *s, INT i_APCI3501_ReadDigitalOutput(struct comedi_device *dev, 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(comedi_device *dev, INT i_APCI3501_ConfigTimerCounterWatchdog(struct comedi_device *dev,
comedi_subdevice *s, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
int i_APCI3501_StartStopWriteTimerCounterWatchdog(comedi_device *dev, int i_APCI3501_StartStopWriteTimerCounterWatchdog(struct comedi_device *dev,
comedi_subdevice *s, comedi_subdevice *s,
comedi_insn *insn, comedi_insn *insn,
unsigned int *data); unsigned int *data);
int i_APCI3501_ReadTimerCounterWatchdog(comedi_device *dev, int i_APCI3501_ReadTimerCounterWatchdog(struct comedi_device *dev,
comedi_subdevice *s, 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);
//Reset functions //Reset functions
int i_APCI3501_Reset(comedi_device *dev); int i_APCI3501_Reset(struct comedi_device *dev);

64
drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.c
View File

@ -55,7 +55,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : INT i_APCI3XXX_TestConversionStarted | | Function Name : INT i_APCI3XXX_TestConversionStarted |
| (comedi_device *dev) | | (struct comedi_device *dev) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task Test if any conversion started | | Task Test if any conversion started |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@ -68,7 +68,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI3XXX_TestConversionStarted(comedi_device * dev) int i_APCI3XXX_TestConversionStarted(struct comedi_device * dev)
{ {
if ((readl((void *)(devpriv->dw_AiBase + 8)) & 0x80000UL) == 0x80000UL) { if ((readl((void *)(devpriv->dw_AiBase + 8)) & 0x80000UL) == 0x80000UL) {
return (1); return (1);
@ -80,7 +80,7 @@ int i_APCI3XXX_TestConversionStarted(comedi_device * dev)
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : INT i_APCI3XXX_AnalogInputConfigOperatingMode | | Function Name : INT i_APCI3XXX_AnalogInputConfigOperatingMode |
| (comedi_device *dev, | | (struct comedi_device *dev, |
| comedi_subdevice *s, | | comedi_subdevice *s, |
| comedi_insn *insn, | | comedi_insn *insn, |
| unsigned int *data) | | unsigned int *data) |
@ -105,7 +105,7 @@ int i_APCI3XXX_TestConversionStarted(comedi_device * dev)
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI3XXX_AnalogInputConfigOperatingMode(comedi_device * dev, int i_APCI3XXX_AnalogInputConfigOperatingMode(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
INT i_ReturnValue = insn->n; INT i_ReturnValue = insn->n;
@ -274,7 +274,7 @@ int i_APCI3XXX_AnalogInputConfigOperatingMode(comedi_device * dev,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : INT i_APCI3XXX_InsnConfigAnalogInput | | Function Name : INT i_APCI3XXX_InsnConfigAnalogInput |
| (comedi_device *dev, | | (struct comedi_device *dev, |
| comedi_subdevice *s, | | comedi_subdevice *s, |
| comedi_insn *insn, | | comedi_insn *insn, |
| unsigned int *data) | | unsigned int *data) |
@ -295,7 +295,7 @@ int i_APCI3XXX_AnalogInputConfigOperatingMode(comedi_device * dev,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI3XXX_InsnConfigAnalogInput(comedi_device * dev, int i_APCI3XXX_InsnConfigAnalogInput(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
INT i_ReturnValue = insn->n; INT i_ReturnValue = insn->n;
@ -332,7 +332,7 @@ int i_APCI3XXX_InsnConfigAnalogInput(comedi_device * dev,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : INT i_APCI3XXX_InsnReadAnalogInput | | Function Name : INT i_APCI3XXX_InsnReadAnalogInput |
| (comedi_device *dev, | | (struct comedi_device *dev, |
| comedi_subdevice *s, | | comedi_subdevice *s, |
| comedi_insn *insn, | | comedi_insn *insn, |
| unsigned int *data) | | unsigned int *data) |
@ -355,7 +355,7 @@ int i_APCI3XXX_InsnConfigAnalogInput(comedi_device * dev,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI3XXX_InsnReadAnalogInput(comedi_device * dev, int i_APCI3XXX_InsnReadAnalogInput(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
INT i_ReturnValue = insn->n; INT i_ReturnValue = insn->n;
@ -606,7 +606,7 @@ int i_APCI3XXX_InsnReadAnalogInput(comedi_device * dev,
void v_APCI3XXX_Interrupt(int irq, void *d) void v_APCI3XXX_Interrupt(int irq, void *d)
{ {
comedi_device *dev = d; struct comedi_device *dev = d;
BYTE b_CopyCpt = 0; BYTE b_CopyCpt = 0;
DWORD dw_Status = 0; DWORD dw_Status = 0;
@ -663,7 +663,7 @@ void v_APCI3XXX_Interrupt(int irq, void *d)
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : INT i_APCI3XXX_InsnWriteAnalogOutput | | Function Name : INT i_APCI3XXX_InsnWriteAnalogOutput |
| (comedi_device *dev, | | (struct comedi_device *dev, |
| comedi_subdevice *s, | | comedi_subdevice *s, |
| comedi_insn *insn, | | comedi_insn *insn, |
| unsigned int *data) | | unsigned int *data) |
@ -684,7 +684,7 @@ void v_APCI3XXX_Interrupt(int irq, void *d)
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI3XXX_InsnWriteAnalogOutput(comedi_device * dev, int i_APCI3XXX_InsnWriteAnalogOutput(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
BYTE b_Range = (BYTE) CR_RANGE(insn->chanspec); BYTE b_Range = (BYTE) CR_RANGE(insn->chanspec);
@ -769,7 +769,7 @@ int i_APCI3XXX_InsnWriteAnalogOutput(comedi_device * dev,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : INT i_APCI3XXX_InsnConfigInitTTLIO | | Function Name : INT i_APCI3XXX_InsnConfigInitTTLIO |
| (comedi_device *dev, | | (struct comedi_device *dev, |
| comedi_subdevice *s, | | comedi_subdevice *s, |
| comedi_insn *insn, | | comedi_insn *insn, |
| unsigned int *data) | | unsigned int *data) |
@ -791,7 +791,7 @@ int i_APCI3XXX_InsnWriteAnalogOutput(comedi_device * dev,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI3XXX_InsnConfigInitTTLIO(comedi_device * dev, int i_APCI3XXX_InsnConfigInitTTLIO(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
INT i_ReturnValue = insn->n; INT i_ReturnValue = insn->n;
@ -900,7 +900,7 @@ int i_APCI3XXX_InsnConfigInitTTLIO(comedi_device * dev,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : INT i_APCI3XXX_InsnBitsTTLIO | | Function Name : INT i_APCI3XXX_InsnBitsTTLIO |
| (comedi_device *dev, | | (struct comedi_device *dev, |
| comedi_subdevice *s, | | comedi_subdevice *s, |
| comedi_insn *insn, | | comedi_insn *insn, |
| unsigned int *data) | | unsigned int *data) |
@ -919,7 +919,7 @@ int i_APCI3XXX_InsnConfigInitTTLIO(comedi_device * dev,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI3XXX_InsnBitsTTLIO(comedi_device * dev, int i_APCI3XXX_InsnBitsTTLIO(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
INT i_ReturnValue = insn->n; INT i_ReturnValue = insn->n;
@ -1057,7 +1057,7 @@ int i_APCI3XXX_InsnBitsTTLIO(comedi_device * dev,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : INT i_APCI3XXX_InsnReadTTLIO | | Function Name : INT i_APCI3XXX_InsnReadTTLIO |
| (comedi_device *dev, | | (struct comedi_device *dev, |
| comedi_subdevice *s, | | comedi_subdevice *s, |
| comedi_insn *insn, | | comedi_insn *insn, |
| unsigned int *data) | | unsigned int *data) |
@ -1074,7 +1074,7 @@ int i_APCI3XXX_InsnBitsTTLIO(comedi_device * dev,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI3XXX_InsnReadTTLIO(comedi_device * dev, int i_APCI3XXX_InsnReadTTLIO(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
BYTE b_Channel = (BYTE) CR_CHAN(insn->chanspec); BYTE b_Channel = (BYTE) CR_CHAN(insn->chanspec);
@ -1169,7 +1169,7 @@ int i_APCI3XXX_InsnReadTTLIO(comedi_device * dev,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : INT i_APCI3XXX_InsnWriteTTLIO | | Function Name : INT i_APCI3XXX_InsnWriteTTLIO |
| (comedi_device *dev, | | (struct comedi_device *dev, |
| comedi_subdevice *s, | | comedi_subdevice *s, |
| comedi_insn *insn, | | comedi_insn *insn, |
| unsigned int *data) | | unsigned int *data) |
@ -1187,7 +1187,7 @@ int i_APCI3XXX_InsnReadTTLIO(comedi_device * dev,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI3XXX_InsnWriteTTLIO(comedi_device * dev, int i_APCI3XXX_InsnWriteTTLIO(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
INT i_ReturnValue = insn->n; INT i_ReturnValue = insn->n;
@ -1281,7 +1281,7 @@ int i_APCI3XXX_InsnWriteTTLIO(comedi_device * dev,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function name :int i_APCI3XXX_InsnReadDigitalInput | | Function name :int i_APCI3XXX_InsnReadDigitalInput |
| (comedi_device *dev, | | (struct comedi_device *dev, |
| comedi_subdevice *s, | | comedi_subdevice *s, |
| comedi_insn *insn, | | comedi_insn *insn, |
| unsigned int *data) | | unsigned int *data) |
@ -1298,7 +1298,7 @@ int i_APCI3XXX_InsnWriteTTLIO(comedi_device * dev,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI3XXX_InsnReadDigitalInput(comedi_device * dev, int i_APCI3XXX_InsnReadDigitalInput(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
INT i_ReturnValue = insn->n; INT i_ReturnValue = insn->n;
@ -1340,7 +1340,7 @@ int i_APCI3XXX_InsnReadDigitalInput(comedi_device * dev,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function name :int i_APCI3XXX_InsnBitsDigitalInput | | Function name :int i_APCI3XXX_InsnBitsDigitalInput |
| (comedi_device *dev, | | (struct comedi_device *dev, |
| comedi_subdevice *s, | | comedi_subdevice *s, |
| comedi_insn *insn, | | comedi_insn *insn, |
| unsigned int *data) | | unsigned int *data) |
@ -1356,7 +1356,7 @@ int i_APCI3XXX_InsnReadDigitalInput(comedi_device * dev,
| -101 : Data size error | | -101 : Data size error |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI3XXX_InsnBitsDigitalInput(comedi_device * dev, int i_APCI3XXX_InsnBitsDigitalInput(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
INT i_ReturnValue = insn->n; INT i_ReturnValue = insn->n;
@ -1391,7 +1391,7 @@ int i_APCI3XXX_InsnBitsDigitalInput(comedi_device * dev,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function name :int i_APCI3XXX_InsnBitsDigitalOutput | | Function name :int i_APCI3XXX_InsnBitsDigitalOutput |
| (comedi_device *dev, | | (struct comedi_device *dev, |
| comedi_subdevice *s, | | comedi_subdevice *s, |
| comedi_insn *insn, | | comedi_insn *insn, |
| unsigned int *data) | | unsigned int *data) |
@ -1409,7 +1409,7 @@ int i_APCI3XXX_InsnBitsDigitalInput(comedi_device * dev,
| -101 : Data size error | | -101 : Data size error |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI3XXX_InsnBitsDigitalOutput(comedi_device * dev, int i_APCI3XXX_InsnBitsDigitalOutput(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
INT i_ReturnValue = insn->n; INT i_ReturnValue = insn->n;
@ -1487,7 +1487,7 @@ int i_APCI3XXX_InsnBitsDigitalOutput(comedi_device * dev,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function name :int i_APCI3XXX_InsnWriteDigitalOutput | | Function name :int i_APCI3XXX_InsnWriteDigitalOutput |
| (comedi_device *dev, | | (struct comedi_device *dev, |
| comedi_subdevice *s, | | comedi_subdevice *s, |
| comedi_insn *insn, | | comedi_insn *insn, |
| unsigned int *data) | | unsigned int *data) |
@ -1505,7 +1505,7 @@ int i_APCI3XXX_InsnBitsDigitalOutput(comedi_device * dev,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI3XXX_InsnWriteDigitalOutput(comedi_device * dev, int i_APCI3XXX_InsnWriteDigitalOutput(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
INT i_ReturnValue = insn->n; INT i_ReturnValue = insn->n;
@ -1563,7 +1563,7 @@ int i_APCI3XXX_InsnWriteDigitalOutput(comedi_device * dev,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function name :int i_APCI3XXX_InsnReadDigitalOutput | | Function name :int i_APCI3XXX_InsnReadDigitalOutput |
| (comedi_device *dev, | | (struct comedi_device *dev, |
| comedi_subdevice *s, | | comedi_subdevice *s, |
| comedi_insn *insn, | | comedi_insn *insn, |
| unsigned int *data) | | unsigned int *data) |
@ -1580,7 +1580,7 @@ int i_APCI3XXX_InsnWriteDigitalOutput(comedi_device * dev,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI3XXX_InsnReadDigitalOutput(comedi_device * dev, int i_APCI3XXX_InsnReadDigitalOutput(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
INT i_ReturnValue = insn->n; INT i_ReturnValue = insn->n;
@ -1627,10 +1627,10 @@ int i_APCI3XXX_InsnReadDigitalOutput(comedi_device * dev,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_APCI3XXX_Reset(comedi_device *dev) | +----------------------------------------------------------------------------+ | Function Name : int i_APCI3XXX_Reset(struct comedi_device *dev) | +----------------------------------------------------------------------------+
| Task :resets all the registers | | Task :resets all the registers |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev | | Input Parameters : struct comedi_device *dev |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Output Parameters : - | | Output Parameters : - |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
@ -1638,7 +1638,7 @@ int i_APCI3XXX_InsnReadDigitalOutput(comedi_device * dev,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
int i_APCI3XXX_Reset(comedi_device * dev) int i_APCI3XXX_Reset(struct comedi_device * dev)
{ {
unsigned char b_Cpt = 0; unsigned char b_Cpt = 0;

28
drivers/staging/comedi/drivers/adl_pci6208.c
View File

@ -106,8 +106,8 @@ typedef struct {
#define devpriv ((pci6208_private *)dev->private) #define devpriv ((pci6208_private *)dev->private)
static int pci6208_attach(comedi_device * dev, comedi_devconfig * it); static int pci6208_attach(struct comedi_device * dev, comedi_devconfig * it);
static int pci6208_detach(comedi_device * dev); static int pci6208_detach(struct comedi_device * dev);
#define pci6208_board_nbr \ #define pci6208_board_nbr \
(sizeof(pci6208_boards) / sizeof(pci6208_board)) (sizeof(pci6208_boards) / sizeof(pci6208_board))
@ -121,19 +121,19 @@ static comedi_driver driver_pci6208 = {
COMEDI_PCI_INITCLEANUP(driver_pci6208, pci6208_pci_table); COMEDI_PCI_INITCLEANUP(driver_pci6208, pci6208_pci_table);
static int pci6208_find_device(comedi_device * dev, int bus, int slot); static int pci6208_find_device(struct comedi_device * dev, int bus, int slot);
static int static int
pci6208_pci_setup(struct pci_dev *pci_dev, unsigned long *io_base_ptr, 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(comedi_device * dev, comedi_subdevice * s, static int pci6208_ao_winsn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int pci6208_ao_rinsn(comedi_device * dev, comedi_subdevice * s, static int pci6208_ao_rinsn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
//static int pci6208_dio_insn_bits(comedi_device *dev,comedi_subdevice *s, //static int pci6208_dio_insn_bits(struct comedi_device *dev,comedi_subdevice *s,
// comedi_insn *insn,unsigned int *data); // comedi_insn *insn,unsigned int *data);
//static int pci6208_dio_insn_config(comedi_device *dev,comedi_subdevice *s, //static int pci6208_dio_insn_config(struct comedi_device *dev,comedi_subdevice *s,
// comedi_insn *insn,unsigned int *data); // comedi_insn *insn,unsigned int *data);
/* /*
@ -142,7 +142,7 @@ static int pci6208_ao_rinsn(comedi_device * dev, comedi_subdevice * s,
* in the driver structure, dev->board_ptr contains that * in the driver structure, dev->board_ptr contains that
* address. * address.
*/ */
static int pci6208_attach(comedi_device * dev, comedi_devconfig * it) static int pci6208_attach(struct comedi_device * dev, comedi_devconfig * it)
{ {
comedi_subdevice *s; comedi_subdevice *s;
int retval; int retval;
@ -205,7 +205,7 @@ static int pci6208_attach(comedi_device * dev, comedi_devconfig * it)
* allocated by _attach(). dev->private and dev->subdevices are * allocated by _attach(). dev->private and dev->subdevices are
* deallocated automatically by the core. * deallocated automatically by the core.
*/ */
static int pci6208_detach(comedi_device * dev) static int pci6208_detach(struct comedi_device * dev)
{ {
printk("comedi%d: pci6208: remove\n", dev->minor); printk("comedi%d: pci6208: remove\n", dev->minor);
@ -219,7 +219,7 @@ static int pci6208_detach(comedi_device * dev)
return 0; return 0;
} }
static int pci6208_ao_winsn(comedi_device * dev, comedi_subdevice * s, static int pci6208_ao_winsn(struct comedi_device * dev, 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(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(comedi_device * dev, comedi_subdevice * s, static int pci6208_ao_rinsn(struct comedi_device * dev, 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(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(comedi_device *dev,comedi_subdevice *s, //static int pci6208_dio_insn_bits(struct comedi_device *dev,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(comedi_device * dev, comedi_subdevice * s,
// return 2; // return 2;
//} //}
//static int pci6208_dio_insn_config(comedi_device *dev,comedi_subdevice *s, //static int pci6208_dio_insn_config(struct comedi_device *dev,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);
@ -305,7 +305,7 @@ static int pci6208_ao_rinsn(comedi_device * dev, comedi_subdevice * s,
// return 1; // return 1;
//} //}
static int pci6208_find_device(comedi_device * dev, int bus, int slot) static int pci6208_find_device(struct comedi_device * dev, int bus, int slot)
{ {
struct pci_dev *pci_dev; struct pci_dev *pci_dev;
int i; int i;

8
drivers/staging/comedi/drivers/adl_pci7296.c
View File

@ -63,8 +63,8 @@ typedef struct {
#define devpriv ((adl_pci7296_private *)dev->private) #define devpriv ((adl_pci7296_private *)dev->private)
static int adl_pci7296_attach(comedi_device * dev, comedi_devconfig * it); static int adl_pci7296_attach(struct comedi_device * dev, comedi_devconfig * it);
static int adl_pci7296_detach(comedi_device * dev); static int adl_pci7296_detach(struct comedi_device * dev);
static comedi_driver driver_adl_pci7296 = { static comedi_driver driver_adl_pci7296 = {
driver_name:"adl_pci7296", driver_name:"adl_pci7296",
module:THIS_MODULE, module:THIS_MODULE,
@ -72,7 +72,7 @@ static comedi_driver driver_adl_pci7296 = {
detach:adl_pci7296_detach, detach:adl_pci7296_detach,
}; };
static int adl_pci7296_attach(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; comedi_subdevice *s;
@ -148,7 +148,7 @@ static int adl_pci7296_attach(comedi_device * dev, comedi_devconfig * it)
return -EIO; return -EIO;
} }
static int adl_pci7296_detach(comedi_device * dev) static int adl_pci7296_detach(struct comedi_device * dev)
{ {
printk("comedi%d: pci7432: remove\n", dev->minor); printk("comedi%d: pci7432: remove\n", dev->minor);

16
drivers/staging/comedi/drivers/adl_pci7432.c
View File

@ -58,8 +58,8 @@ typedef struct {
#define devpriv ((adl_pci7432_private *)dev->private) #define devpriv ((adl_pci7432_private *)dev->private)
static int adl_pci7432_attach(comedi_device * dev, comedi_devconfig * it); static int adl_pci7432_attach(struct comedi_device * dev, comedi_devconfig * it);
static int adl_pci7432_detach(comedi_device * dev); static int adl_pci7432_detach(struct comedi_device * dev);
static comedi_driver driver_adl_pci7432 = { static comedi_driver driver_adl_pci7432 = {
driver_name:"adl_pci7432", driver_name:"adl_pci7432",
module:THIS_MODULE, module:THIS_MODULE,
@ -69,15 +69,15 @@ static comedi_driver driver_adl_pci7432 = {
/* Digital IO */ /* Digital IO */
static int adl_pci7432_di_insn_bits(comedi_device * dev, comedi_subdevice * s, static int adl_pci7432_di_insn_bits(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int adl_pci7432_do_insn_bits(comedi_device * dev, comedi_subdevice * s, static int adl_pci7432_do_insn_bits(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
/* */ /* */
static int adl_pci7432_attach(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; comedi_subdevice *s;
@ -150,7 +150,7 @@ static int adl_pci7432_attach(comedi_device * dev, comedi_devconfig * it)
return -EIO; return -EIO;
} }
static int adl_pci7432_detach(comedi_device * dev) static int adl_pci7432_detach(struct comedi_device * dev)
{ {
printk("comedi%d: pci7432: remove\n", dev->minor); printk("comedi%d: pci7432: remove\n", dev->minor);
@ -164,7 +164,7 @@ static int adl_pci7432_detach(comedi_device * dev)
return 0; return 0;
} }
static int adl_pci7432_do_insn_bits(comedi_device * dev, comedi_subdevice * s, static int adl_pci7432_do_insn_bits(struct comedi_device * dev, 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(comedi_device * dev, comedi_subdevice * s,
return 2; return 2;
} }
static int adl_pci7432_di_insn_bits(comedi_device * dev, comedi_subdevice * s, static int adl_pci7432_di_insn_bits(struct comedi_device * dev, 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");

40
drivers/staging/comedi/drivers/adl_pci8164.c
View File

@ -70,8 +70,8 @@ typedef struct {
#define devpriv ((adl_pci8164_private *)dev->private) #define devpriv ((adl_pci8164_private *)dev->private)
static int adl_pci8164_attach(comedi_device * dev, comedi_devconfig * it); static int adl_pci8164_attach(struct comedi_device * dev, comedi_devconfig * it);
static int adl_pci8164_detach(comedi_device * dev); static int adl_pci8164_detach(struct comedi_device * dev);
static comedi_driver driver_adl_pci8164 = { static comedi_driver driver_adl_pci8164 = {
driver_name:"adl_pci8164", driver_name:"adl_pci8164",
module:THIS_MODULE, module:THIS_MODULE,
@ -79,31 +79,31 @@ static comedi_driver driver_adl_pci8164 = {
detach:adl_pci8164_detach, detach:adl_pci8164_detach,
}; };
static int adl_pci8164_insn_read_msts(comedi_device * dev, comedi_subdevice * s, static int adl_pci8164_insn_read_msts(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int adl_pci8164_insn_read_ssts(comedi_device * dev, comedi_subdevice * s, static int adl_pci8164_insn_read_ssts(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int adl_pci8164_insn_read_buf0(comedi_device * dev, comedi_subdevice * s, static int adl_pci8164_insn_read_buf0(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int adl_pci8164_insn_read_buf1(comedi_device * dev, comedi_subdevice * s, static int adl_pci8164_insn_read_buf1(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int adl_pci8164_insn_write_cmd(comedi_device * dev, comedi_subdevice * s, static int adl_pci8164_insn_write_cmd(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int adl_pci8164_insn_write_otp(comedi_device * dev, comedi_subdevice * s, static int adl_pci8164_insn_write_otp(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int adl_pci8164_insn_write_buf0(comedi_device * dev, static int adl_pci8164_insn_write_buf0(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data); comedi_subdevice * s, comedi_insn * insn, unsigned int * data);
static int adl_pci8164_insn_write_buf1(comedi_device * dev, static int adl_pci8164_insn_write_buf1(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data); comedi_subdevice * s, comedi_insn * insn, unsigned int * data);
static int adl_pci8164_attach(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; comedi_subdevice *s;
@ -194,7 +194,7 @@ static int adl_pci8164_attach(comedi_device * dev, comedi_devconfig * it)
return -EIO; return -EIO;
} }
static int adl_pci8164_detach(comedi_device * dev) static int adl_pci8164_detach(struct comedi_device * dev)
{ {
printk("comedi%d: pci8164: remove\n", dev->minor); printk("comedi%d: pci8164: remove\n", dev->minor);
@ -208,7 +208,7 @@ static int adl_pci8164_detach(comedi_device * dev)
return 0; return 0;
} }
static int adl_pci8164_insn_read_msts(comedi_device * dev, comedi_subdevice * s, static int adl_pci8164_insn_read_msts(struct comedi_device * dev, 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(comedi_device * dev, comedi_subdevice * s,
return 2; return 2;
} }
static int adl_pci8164_insn_read_ssts(comedi_device * dev, comedi_subdevice * s, static int adl_pci8164_insn_read_ssts(struct comedi_device * dev, 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(comedi_device * dev, comedi_subdevice * s,
return 2; return 2;
} }
static int adl_pci8164_insn_read_buf0(comedi_device * dev, comedi_subdevice * s, static int adl_pci8164_insn_read_buf0(struct comedi_device * dev, 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(comedi_device * dev, comedi_subdevice * s,
return 2; return 2;
} }
static int adl_pci8164_insn_read_buf1(comedi_device * dev, comedi_subdevice * s, static int adl_pci8164_insn_read_buf1(struct comedi_device * dev, 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(comedi_device * dev, comedi_subdevice * s,
return 2; return 2;
} }
static int adl_pci8164_insn_write_cmd(comedi_device * dev, comedi_subdevice * s, static int adl_pci8164_insn_write_cmd(struct comedi_device * dev, 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(comedi_device * dev, comedi_subdevice * s,
return 2; return 2;
} }
static int adl_pci8164_insn_write_otp(comedi_device * dev, comedi_subdevice * s, static int adl_pci8164_insn_write_otp(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
int axis, axis_reg; int axis, axis_reg;
@ -433,7 +433,7 @@ static int adl_pci8164_insn_write_otp(comedi_device * dev, comedi_subdevice * s,
return 2; return 2;
} }
static int adl_pci8164_insn_write_buf0(comedi_device * dev, static int adl_pci8164_insn_write_buf0(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
int axis, axis_reg; int axis, axis_reg;
@ -471,7 +471,7 @@ static int adl_pci8164_insn_write_buf0(comedi_device * dev,
return 2; return 2;
} }
static int adl_pci8164_insn_write_buf1(comedi_device * dev, static int adl_pci8164_insn_write_buf1(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
int axis, axis_reg; int axis, axis_reg;

42
drivers/staging/comedi/drivers/adl_pci9111.c
View File

@ -265,9 +265,9 @@ TODO:
// Function prototypes // Function prototypes
// //
static int pci9111_attach(comedi_device * dev, comedi_devconfig * it); static int pci9111_attach(struct comedi_device * dev, comedi_devconfig * it);
static int pci9111_detach(comedi_device * dev); static int pci9111_detach(struct comedi_device * dev);
static void pci9111_ai_munge(comedi_device * dev, comedi_subdevice * s, static void pci9111_ai_munge(struct comedi_device * dev, 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 = {
@ -415,7 +415,7 @@ static void plx9050_interrupt_control(unsigned long io_base,
// 8254 timer // 8254 timer
// //
static void pci9111_timer_set(comedi_device * dev) static void pci9111_timer_set(struct comedi_device * dev)
{ {
pci9111_8254_control_set(PCI9111_8254_COUNTER_0 | pci9111_8254_control_set(PCI9111_8254_COUNTER_0 |
PCI9111_8254_READ_LOAD_LSB_MSB | PCI9111_8254_READ_LOAD_LSB_MSB |
@ -441,7 +441,7 @@ typedef enum {
external external
} pci9111_trigger_sources; } pci9111_trigger_sources;
static void pci9111_trigger_source_set(comedi_device * dev, static void pci9111_trigger_source_set(struct comedi_device * dev,
pci9111_trigger_sources source) pci9111_trigger_sources source)
{ {
int flags; int flags;
@ -465,7 +465,7 @@ static void pci9111_trigger_source_set(comedi_device * dev,
pci9111_trigger_and_autoscan_set(flags); pci9111_trigger_and_autoscan_set(flags);
} }
static void pci9111_pretrigger_set(comedi_device * dev, bool pretrigger) static void pci9111_pretrigger_set(struct comedi_device * dev, bool pretrigger)
{ {
int flags; int flags;
@ -477,7 +477,7 @@ static void pci9111_pretrigger_set(comedi_device * dev, bool pretrigger)
pci9111_trigger_and_autoscan_set(flags); pci9111_trigger_and_autoscan_set(flags);
} }
static void pci9111_autoscan_set(comedi_device * dev, bool autoscan) static void pci9111_autoscan_set(struct comedi_device * dev, bool autoscan)
{ {
int flags; int flags;
@ -499,7 +499,7 @@ typedef enum {
irq_on_external_trigger irq_on_external_trigger
} pci9111_ISC1_sources; } pci9111_ISC1_sources;
static void pci9111_interrupt_source_set(comedi_device * dev, static void pci9111_interrupt_source_set(struct comedi_device * dev,
pci9111_ISC0_sources irq_0_source, pci9111_ISC1_sources irq_1_source) pci9111_ISC0_sources irq_0_source, pci9111_ISC1_sources irq_1_source)
{ {
int flags; int flags;
@ -527,7 +527,7 @@ static void pci9111_interrupt_source_set(comedi_device * dev,
#undef AI_DO_CMD_DEBUG #undef AI_DO_CMD_DEBUG
static int pci9111_ai_cancel(comedi_device * dev, comedi_subdevice * s) static int pci9111_ai_cancel(struct comedi_device * dev, comedi_subdevice * s)
{ {
// Disable interrupts // Disable interrupts
@ -557,7 +557,7 @@ static int pci9111_ai_cancel(comedi_device * dev, comedi_subdevice * s)
if (!src || tmp != src) error++ if (!src || tmp != src) error++
static int static int
pci9111_ai_do_cmd_test(comedi_device * dev, pci9111_ai_do_cmd_test(struct comedi_device * dev,
comedi_subdevice * s, comedi_cmd * cmd) comedi_subdevice * s, comedi_cmd * cmd)
{ {
int tmp; int tmp;
@ -758,7 +758,7 @@ pci9111_ai_do_cmd_test(comedi_device * dev,
// Analog input command // Analog input command
// //
static int pci9111_ai_do_cmd(comedi_device * dev, comedi_subdevice * subdevice) static int pci9111_ai_do_cmd(struct comedi_device * dev, 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(comedi_device * dev, comedi_subdevice * subdevice)
return 0; return 0;
} }
static void pci9111_ai_munge(comedi_device * dev, comedi_subdevice * s, static void pci9111_ai_munge(struct comedi_device * dev, 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);
@ -911,7 +911,7 @@ static void pci9111_ai_munge(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)
{ {
comedi_device *dev = p_device; struct comedi_device *dev = p_device;
comedi_subdevice *subdevice = dev->read_subdev; comedi_subdevice *subdevice = dev->read_subdev;
comedi_async *async; comedi_async *async;
unsigned long irq_flags; unsigned long irq_flags;
@ -1071,7 +1071,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(comedi_device * dev, static int pci9111_ai_insn_read(struct comedi_device * dev,
comedi_subdevice * subdevice, comedi_insn * insn, unsigned int * data) comedi_subdevice * subdevice, comedi_insn * insn, unsigned int * data)
{ {
int resolution = int resolution =
@ -1131,7 +1131,7 @@ static int pci9111_ai_insn_read(comedi_device * dev,
// //
static int static int
pci9111_ao_insn_write(comedi_device * dev, pci9111_ao_insn_write(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
int i; int i;
@ -1148,7 +1148,7 @@ pci9111_ao_insn_write(comedi_device * dev,
// Analog output readback // Analog output readback
// //
static int pci9111_ao_insn_read(comedi_device * dev, static int pci9111_ao_insn_read(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
int i; int i;
@ -1170,7 +1170,7 @@ static int pci9111_ao_insn_read(comedi_device * dev,
// Digital inputs // Digital inputs
// //
static int pci9111_di_insn_bits(comedi_device * dev, static int pci9111_di_insn_bits(struct comedi_device * dev,
comedi_subdevice * subdevice, comedi_insn * insn, unsigned int * data) comedi_subdevice * subdevice, comedi_insn * insn, unsigned int * data)
{ {
unsigned int bits; unsigned int bits;
@ -1185,7 +1185,7 @@ static int pci9111_di_insn_bits(comedi_device * dev,
// Digital outputs // Digital outputs
// //
static int pci9111_do_insn_bits(comedi_device * dev, static int pci9111_do_insn_bits(struct comedi_device * dev,
comedi_subdevice * subdevice, comedi_insn * insn, unsigned int * data) comedi_subdevice * subdevice, comedi_insn * insn, unsigned int * data)
{ {
unsigned int bits; unsigned int bits;
@ -1218,7 +1218,7 @@ static int pci9111_do_insn_bits(comedi_device * dev,
// Reset device // Reset device
// //
static int pci9111_reset(comedi_device * dev) static int pci9111_reset(struct comedi_device * dev)
{ {
// Set trigger source to software // Set trigger source to software
@ -1246,7 +1246,7 @@ static int pci9111_reset(comedi_device * dev)
// - Declare device driver capability // - Declare device driver capability
// //
static int pci9111_attach(comedi_device * dev, comedi_devconfig * it) static int pci9111_attach(struct comedi_device * dev, comedi_devconfig * it)
{ {
comedi_subdevice *subdevice; 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;
@ -1420,7 +1420,7 @@ static int pci9111_attach(comedi_device * dev, comedi_devconfig * it)
// Detach // Detach
// //
static int pci9111_detach(comedi_device * dev) static int pci9111_detach(struct comedi_device * dev)
{ {
// Reset device // Reset device

80
drivers/staging/comedi/drivers/adl_pci9118.c
View File

@ -178,8 +178,8 @@ static const comedi_lrange range_pci9118hg = { 8, {
#define PCI9118_BIPOLAR_RANGES 4 /* used for test on mixture of BIP/UNI ranges */ #define PCI9118_BIPOLAR_RANGES 4 /* used for test on mixture of BIP/UNI ranges */
static int pci9118_attach(comedi_device * dev, comedi_devconfig * it); static int pci9118_attach(struct comedi_device * dev, comedi_devconfig * it);
static int pci9118_detach(comedi_device * dev); static int pci9118_detach(struct comedi_device * dev);
typedef struct { typedef struct {
const char *name; // board name const char *name; // board name
@ -288,7 +288,7 @@ typedef struct {
unsigned char cnt0_users; // bit field of 8254 CNT0 users (0-unused, 1-AO, 2-DI, 3-DO) unsigned char cnt0_users; // bit field of 8254 CNT0 users (0-unused, 1-AO, 2-DI, 3-DO)
unsigned char exttrg_users; // bit field of external trigger users (0-AI, 1-AO, 2-DI, 3-DO) unsigned char exttrg_users; // bit field of external trigger users (0-AI, 1-AO, 2-DI, 3-DO)
unsigned int cnt0_divisor; // actual CNT0 divisor unsigned int cnt0_divisor; // actual CNT0 divisor
void (*int_ai_func) (comedi_device *, comedi_subdevice *, unsigned short, unsigned int, unsigned short); // ptr to actual interrupt AI function void (*int_ai_func) (struct comedi_device *, comedi_subdevice *, unsigned short, unsigned int, unsigned short); // ptr to actual interrupt AI function
unsigned char ai16bits; // =1 16 bit card unsigned char ai16bits; // =1 16 bit card
unsigned char usedma; // =1 use DMA transfer and not INT unsigned char usedma; // =1 use DMA transfer and not INT
unsigned char useeoshandle; // =1 change WAKE_EOS DMA transfer to fit on every second unsigned char useeoshandle; // =1 change WAKE_EOS DMA transfer to fit on every second
@ -308,18 +308,18 @@ typedef struct {
============================================================================== ==============================================================================
*/ */
static int check_channel_list(comedi_device * dev, comedi_subdevice * s, static int check_channel_list(struct comedi_device * dev, comedi_subdevice * s,
int n_chan, unsigned int *chanlist, int frontadd, int backadd); int n_chan, unsigned int *chanlist, int frontadd, int backadd);
static int setup_channel_list(comedi_device * dev, comedi_subdevice * s, static int setup_channel_list(struct comedi_device * dev, comedi_subdevice * s,
int n_chan, unsigned int *chanlist, int rot, int frontadd, int backadd, int n_chan, unsigned int *chanlist, int rot, int frontadd, int backadd,
int usedma, char eoshandle); int usedma, char eoshandle);
static void start_pacer(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 pci9118_reset(comedi_device * dev); static int pci9118_reset(struct comedi_device * dev);
static int pci9118_exttrg_add(comedi_device * dev, unsigned char source); static int pci9118_exttrg_add(struct comedi_device * dev, unsigned char source);
static int pci9118_exttrg_del(comedi_device * dev, unsigned char source); static int pci9118_exttrg_del(struct comedi_device * dev, unsigned char source);
static int pci9118_ai_cancel(comedi_device * dev, comedi_subdevice * s); static int pci9118_ai_cancel(struct comedi_device * dev, comedi_subdevice * s);
static void pci9118_calc_divisors(char mode, comedi_device * dev, static void pci9118_calc_divisors(char mode, struct comedi_device * dev,
comedi_subdevice * s, unsigned int *tim1, unsigned int *tim2, comedi_subdevice * s, unsigned int *tim1, unsigned int *tim2,
unsigned int flags, int chans, unsigned int *div1, unsigned int *div2, unsigned int flags, int chans, unsigned int *div1, unsigned int *div2,
char usessh, unsigned int chnsshfront); char usessh, unsigned int chnsshfront);
@ -327,7 +327,7 @@ static void pci9118_calc_divisors(char mode, comedi_device * dev,
/* /*
============================================================================== ==============================================================================
*/ */
static int pci9118_insn_read_ai(comedi_device * dev, comedi_subdevice * s, static int pci9118_insn_read_ai(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
@ -377,7 +377,7 @@ static int pci9118_insn_read_ai(comedi_device * dev, comedi_subdevice * s,
/* /*
============================================================================== ==============================================================================
*/ */
static int pci9118_insn_write_ao(comedi_device * dev, comedi_subdevice * s, static int pci9118_insn_write_ao(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
int n, chanreg, ch; int n, chanreg, ch;
@ -400,7 +400,7 @@ static int pci9118_insn_write_ao(comedi_device * dev, comedi_subdevice * s,
/* /*
============================================================================== ==============================================================================
*/ */
static int pci9118_insn_read_ao(comedi_device * dev, comedi_subdevice * s, static int pci9118_insn_read_ao(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
int n, chan; int n, chan;
@ -415,7 +415,7 @@ static int pci9118_insn_read_ao(comedi_device * dev, comedi_subdevice * s,
/* /*
============================================================================== ==============================================================================
*/ */
static int pci9118_insn_bits_di(comedi_device * dev, comedi_subdevice * s, static int pci9118_insn_bits_di(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
data[1] = inl(dev->iobase + PCI9118_DI) & 0xf; data[1] = inl(dev->iobase + PCI9118_DI) & 0xf;
@ -426,7 +426,7 @@ static int pci9118_insn_bits_di(comedi_device * dev, comedi_subdevice * s,
/* /*
============================================================================== ==============================================================================
*/ */
static int pci9118_insn_bits_do(comedi_device * dev, comedi_subdevice * s, static int pci9118_insn_bits_do(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
if (data[0]) { if (data[0]) {
@ -442,7 +442,7 @@ static int pci9118_insn_bits_do(comedi_device * dev, comedi_subdevice * s,
/* /*
============================================================================== ==============================================================================
*/ */
static void interrupt_pci9118_ai_mode4_switch(comedi_device * dev) static void interrupt_pci9118_ai_mode4_switch(struct comedi_device * dev)
{ {
devpriv->AdFunctionReg = devpriv->AdFunctionReg =
AdFunction_PDTrg | AdFunction_PETrg | AdFunction_AM; AdFunction_PDTrg | AdFunction_PETrg | AdFunction_AM;
@ -456,7 +456,7 @@ static void interrupt_pci9118_ai_mode4_switch(comedi_device * dev)
outl(devpriv->AdFunctionReg, dev->iobase + PCI9118_ADFUNC); outl(devpriv->AdFunctionReg, dev->iobase + PCI9118_ADFUNC);
} }
static unsigned int defragment_dma_buffer(comedi_device * dev, static unsigned int defragment_dma_buffer(struct comedi_device * dev,
comedi_subdevice * s, short * dma_buffer, unsigned int num_samples) comedi_subdevice * s, short * dma_buffer, unsigned int num_samples)
{ {
unsigned int i = 0, j = 0; unsigned int i = 0, j = 0;
@ -480,7 +480,7 @@ static unsigned int defragment_dma_buffer(comedi_device * dev,
/* /*
============================================================================== ==============================================================================
*/ */
static unsigned int move_block_from_dma(comedi_device * dev, static unsigned int move_block_from_dma(struct comedi_device * dev,
comedi_subdevice * s, short * dma_buffer, unsigned int num_samples) comedi_subdevice * s, short * dma_buffer, unsigned int num_samples)
{ {
unsigned int num_bytes; unsigned int num_bytes;
@ -501,7 +501,7 @@ static unsigned int move_block_from_dma(comedi_device * dev,
/* /*
============================================================================== ==============================================================================
*/ */
static char pci9118_decode_error_status(comedi_device * dev, static char pci9118_decode_error_status(struct comedi_device * dev,
comedi_subdevice * s, unsigned char m) comedi_subdevice * s, unsigned char m)
{ {
if (m & 0x100) { if (m & 0x100) {
@ -531,7 +531,7 @@ static char pci9118_decode_error_status(comedi_device * dev,
return 0; return 0;
} }
static void pci9118_ai_munge(comedi_device * dev, comedi_subdevice * s, static void pci9118_ai_munge(struct comedi_device * dev, 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);
@ -551,7 +551,7 @@ static void pci9118_ai_munge(comedi_device * dev, comedi_subdevice * s,
/* /*
============================================================================== ==============================================================================
*/ */
static void interrupt_pci9118_ai_onesample(comedi_device * dev, static void interrupt_pci9118_ai_onesample(struct comedi_device * dev,
comedi_subdevice * s, unsigned short int_adstat, unsigned int int_amcc, comedi_subdevice * s, unsigned short int_adstat, unsigned int int_amcc,
unsigned short int_daq) unsigned short int_daq)
{ {
@ -598,7 +598,7 @@ static void interrupt_pci9118_ai_onesample(comedi_device * dev,
/* /*
============================================================================== ==============================================================================
*/ */
static void interrupt_pci9118_ai_dma(comedi_device * dev, comedi_subdevice * s, static void interrupt_pci9118_ai_dma(struct comedi_device * dev, comedi_subdevice * s,
unsigned short int_adstat, unsigned int int_amcc, unsigned short int_adstat, unsigned int int_amcc,
unsigned short int_daq) unsigned short int_daq)
{ {
@ -676,7 +676,7 @@ static void interrupt_pci9118_ai_dma(comedi_device * dev, comedi_subdevice * s,
*/ */
static irqreturn_t interrupt_pci9118(int irq, void *d PT_REGS_ARG) static irqreturn_t interrupt_pci9118(int irq, void *d PT_REGS_ARG)
{ {
comedi_device *dev = d; struct comedi_device *dev = d;
unsigned int int_daq = 0, int_amcc, int_adstat; unsigned int int_daq = 0, int_amcc, int_adstat;
if (!dev->attached) if (!dev->attached)
@ -727,7 +727,7 @@ static irqreturn_t interrupt_pci9118(int irq, void *d PT_REGS_ARG)
/* /*
============================================================================== ==============================================================================
*/ */
static int pci9118_ai_inttrig(comedi_device * dev, comedi_subdevice * s, static int pci9118_ai_inttrig(struct comedi_device * dev, comedi_subdevice * s,
unsigned int trignum) unsigned int trignum)
{ {
if (trignum != devpriv->ai_inttrig_start) if (trignum != devpriv->ai_inttrig_start)
@ -751,7 +751,7 @@ static int pci9118_ai_inttrig(comedi_device * dev, comedi_subdevice * s,
/* /*
============================================================================== ==============================================================================
*/ */
static int pci9118_ai_cmdtest(comedi_device * dev, comedi_subdevice * s, static int pci9118_ai_cmdtest(struct comedi_device * dev, comedi_subdevice * s,
comedi_cmd * cmd) comedi_cmd * cmd)
{ {
int err = 0; int err = 0;
@ -1009,7 +1009,7 @@ static int pci9118_ai_cmdtest(comedi_device * dev, comedi_subdevice * s,
/* /*
============================================================================== ==============================================================================
*/ */
static int Compute_and_setup_dma(comedi_device * dev) static int Compute_and_setup_dma(struct comedi_device * dev)
{ {
unsigned int dmalen0, dmalen1, i; unsigned int dmalen0, dmalen1, i;
@ -1163,7 +1163,7 @@ static int Compute_and_setup_dma(comedi_device * dev)
/* /*
============================================================================== ==============================================================================
*/ */
static int pci9118_ai_docmd_sampl(comedi_device * dev, comedi_subdevice * s) static int pci9118_ai_docmd_sampl(struct comedi_device * dev, comedi_subdevice * s)
{ {
DPRINTK("adl_pci9118 EDBG: BGN: pci9118_ai_docmd_sampl(%d,) [%d]\n", DPRINTK("adl_pci9118 EDBG: BGN: pci9118_ai_docmd_sampl(%d,) [%d]\n",
dev->minor, devpriv->ai_do); dev->minor, devpriv->ai_do);
@ -1216,7 +1216,7 @@ static int pci9118_ai_docmd_sampl(comedi_device * dev, comedi_subdevice * s)
/* /*
============================================================================== ==============================================================================
*/ */
static int pci9118_ai_docmd_dma(comedi_device * dev, comedi_subdevice * s) static int pci9118_ai_docmd_dma(struct comedi_device * dev, comedi_subdevice * s)
{ {
DPRINTK("adl_pci9118 EDBG: BGN: pci9118_ai_docmd_dma(%d,) [%d,%d]\n", DPRINTK("adl_pci9118 EDBG: BGN: pci9118_ai_docmd_dma(%d,) [%d,%d]\n",
dev->minor, devpriv->ai_do, devpriv->usedma); dev->minor, devpriv->ai_do, devpriv->usedma);
@ -1287,7 +1287,7 @@ static int pci9118_ai_docmd_dma(comedi_device * dev, comedi_subdevice * s)
/* /*
============================================================================== ==============================================================================
*/ */
static int pci9118_ai_cmd(comedi_device * dev, comedi_subdevice * s) static int pci9118_ai_cmd(struct comedi_device * dev, comedi_subdevice * s)
{ {
comedi_cmd *cmd = &s->async->cmd; comedi_cmd *cmd = &s->async->cmd;
unsigned int addchans = 0; unsigned int addchans = 0;
@ -1486,7 +1486,7 @@ static int pci9118_ai_cmd(comedi_device * dev, comedi_subdevice * s)
/* /*
============================================================================== ==============================================================================
*/ */
static int check_channel_list(comedi_device * dev, comedi_subdevice * s, static int check_channel_list(struct comedi_device * dev, comedi_subdevice * s,
int n_chan, unsigned int *chanlist, int frontadd, int backadd) int n_chan, unsigned int *chanlist, int frontadd, int backadd)
{ {
unsigned int i, differencial = 0, bipolar = 0; unsigned int i, differencial = 0, bipolar = 0;
@ -1537,7 +1537,7 @@ static int check_channel_list(comedi_device * dev, comedi_subdevice * s,
/* /*
============================================================================== ==============================================================================
*/ */
static int setup_channel_list(comedi_device * dev, comedi_subdevice * s, static int setup_channel_list(struct comedi_device * dev, comedi_subdevice * s,
int n_chan, unsigned int *chanlist, int rot, int frontadd, int backadd, int n_chan, unsigned int *chanlist, int rot, int frontadd, int backadd,
int usedma, char useeos) int usedma, char useeos)
{ {
@ -1651,7 +1651,7 @@ static int setup_channel_list(comedi_device * dev, comedi_subdevice * s,
============================================================================== ==============================================================================
calculate 8254 divisors if they are used for dual timing calculate 8254 divisors if they are used for dual timing
*/ */
static void pci9118_calc_divisors(char mode, comedi_device * dev, static void pci9118_calc_divisors(char mode, struct comedi_device * dev,
comedi_subdevice * s, unsigned int *tim1, unsigned int *tim2, comedi_subdevice * s, unsigned int *tim1, unsigned int *tim2,
unsigned int flags, int chans, unsigned int *div1, unsigned int *div2, unsigned int flags, int chans, unsigned int *div1, unsigned int *div2,
char usessh, unsigned int chnsshfront) char usessh, unsigned int chnsshfront)
@ -1710,7 +1710,7 @@ static void pci9118_calc_divisors(char mode, comedi_device * dev,
/* /*
============================================================================== ==============================================================================
*/ */
static void start_pacer(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)
{ {
outl(0x74, dev->iobase + PCI9118_CNTCTRL); outl(0x74, dev->iobase + PCI9118_CNTCTRL);
@ -1729,7 +1729,7 @@ static void start_pacer(comedi_device * dev, int mode, unsigned int divisor1,
/* /*
============================================================================== ==============================================================================
*/ */
static int pci9118_exttrg_add(comedi_device * dev, unsigned char source) static int pci9118_exttrg_add(struct comedi_device * dev, unsigned char source)
{ {
if (source > 3) if (source > 3)
return -1; // incorrect source return -1; // incorrect source
@ -1743,7 +1743,7 @@ static int pci9118_exttrg_add(comedi_device * dev, unsigned char source)
/* /*
============================================================================== ==============================================================================
*/ */
static int pci9118_exttrg_del(comedi_device * dev, unsigned char source) static int pci9118_exttrg_del(struct comedi_device * dev, unsigned char source)
{ {
if (source > 3) if (source > 3)
return -1; // incorrect source return -1; // incorrect source
@ -1760,7 +1760,7 @@ static int pci9118_exttrg_del(comedi_device * dev, unsigned char source)
/* /*
============================================================================== ==============================================================================
*/ */
static int pci9118_ai_cancel(comedi_device * dev, comedi_subdevice * s) static int pci9118_ai_cancel(struct comedi_device * dev, comedi_subdevice * s)
{ {
if (devpriv->usedma) if (devpriv->usedma)
outl(inl(devpriv->iobase_a + AMCC_OP_REG_MCSR) & (~EN_A2P_TRANSFERS), devpriv->iobase_a + AMCC_OP_REG_MCSR); // stop DMA outl(inl(devpriv->iobase_a + AMCC_OP_REG_MCSR) & (~EN_A2P_TRANSFERS), devpriv->iobase_a + AMCC_OP_REG_MCSR); // stop DMA
@ -1795,7 +1795,7 @@ static int pci9118_ai_cancel(comedi_device * dev, comedi_subdevice * s)
/* /*
============================================================================== ==============================================================================
*/ */
static int pci9118_reset(comedi_device * dev) static int pci9118_reset(struct comedi_device * dev)
{ {
devpriv->IntControlReg = 0; devpriv->IntControlReg = 0;
devpriv->exttrg_users = 0; devpriv->exttrg_users = 0;
@ -1835,7 +1835,7 @@ static int pci9118_reset(comedi_device * dev)
/* /*
============================================================================== ==============================================================================
*/ */
static int pci9118_attach(comedi_device * dev, comedi_devconfig * it) static int pci9118_attach(struct comedi_device * dev, comedi_devconfig * it)
{ {
comedi_subdevice *s; comedi_subdevice *s;
int ret, pages, i; int ret, pages, i;
@ -2071,7 +2071,7 @@ static int pci9118_attach(comedi_device * dev, comedi_devconfig * it)
/* /*
============================================================================== ==============================================================================
*/ */
static int pci9118_detach(comedi_device * dev) static int pci9118_detach(struct comedi_device * dev)
{ {
if (dev->private) { if (dev->private) {
if (devpriv->valid) if (devpriv->valid)

20
drivers/staging/comedi/drivers/adq12b.c
View File

@ -162,8 +162,8 @@ typedef struct{
* the board, and also about the kernel module that contains * the board, and also about the kernel module that contains
* the device code. * the device code.
*/ */
static int adq12b_attach(comedi_device *dev,comedi_devconfig *it); static int adq12b_attach(struct comedi_device *dev,comedi_devconfig *it);
static int adq12b_detach(comedi_device *dev); static int adq12b_detach(struct comedi_device *dev);
static comedi_driver driver_adq12b={ static comedi_driver driver_adq12b={
driver_name: "adq12b", driver_name: "adq12b",
module: THIS_MODULE, module: THIS_MODULE,
@ -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(comedi_device *dev,comedi_subdevice *s,comedi_insn *insn,unsigned int *data); static int adq12b_ai_rinsn(struct comedi_device *dev,comedi_subdevice *s,comedi_insn *insn,unsigned int *data);
static int adq12b_di_insn_bits(comedi_device *dev,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_do_insn_bits(comedi_device *dev,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);
/* /*
* Attach is called by the Comedi core to configure the driver * Attach is called by the Comedi core to configure the driver
@ -184,7 +184,7 @@ static int adq12b_do_insn_bits(comedi_device *dev,comedi_subdevice *s, comedi_in
* in the driver structure, dev->board_ptr contains that * in the driver structure, dev->board_ptr contains that
* address. * address.
*/ */
static int adq12b_attach(comedi_device *dev,comedi_devconfig *it) static int adq12b_attach(struct comedi_device *dev,comedi_devconfig *it)
{ {
comedi_subdevice *s; comedi_subdevice *s;
unsigned long iobase; unsigned long iobase;
@ -297,7 +297,7 @@ static int adq12b_attach(comedi_device *dev,comedi_devconfig *it)
* allocated by _attach(). dev->private and dev->subdevices are * allocated by _attach(). dev->private and dev->subdevices are
* deallocated automatically by the core. * deallocated automatically by the core.
*/ */
static int adq12b_detach(comedi_device *dev) static int adq12b_detach(struct comedi_device *dev)
{ {
if (dev->iobase) if (dev->iobase)
release_region(dev->iobase, ADQ12B_SIZE); release_region(dev->iobase, ADQ12B_SIZE);
@ -314,7 +314,7 @@ static int adq12b_detach(comedi_device *dev)
* mode. * mode.
*/ */
static int adq12b_ai_rinsn(comedi_device *dev,comedi_subdevice *s,comedi_insn *insn,unsigned int *data) static int adq12b_ai_rinsn(struct comedi_device *dev,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(comedi_device *dev,comedi_subdevice *s,comedi_insn *i
} }
static int adq12b_di_insn_bits(comedi_device *dev,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)
{ {
/* 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(comedi_device *dev,comedi_subdevice *s, comedi_i
} }
static int adq12b_do_insn_bits(comedi_device *dev,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)
{ {
int channel; int channel;

64
drivers/staging/comedi/drivers/adv_pci1710.c
View File

@ -182,8 +182,8 @@ static const comedi_lrange range_pci171x_da = { 2, {
} }
}; };
static int pci1710_attach(comedi_device * dev, comedi_devconfig * it); static int pci1710_attach(struct comedi_device * dev, comedi_devconfig * it);
static int pci1710_detach(comedi_device * dev); static int pci1710_detach(struct comedi_device * dev);
typedef struct { typedef struct {
const char *name; // board name const char *name; // board name
@ -304,14 +304,14 @@ typedef struct {
============================================================================== ==============================================================================
*/ */
static int check_channel_list(comedi_device * dev, comedi_subdevice * s, static int check_channel_list(struct comedi_device * dev, comedi_subdevice * s,
unsigned int *chanlist, unsigned int n_chan); unsigned int *chanlist, unsigned int n_chan);
static void setup_channel_list(comedi_device * dev, comedi_subdevice * s, static void setup_channel_list(struct comedi_device * dev, 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(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(comedi_device * dev); static int pci1710_reset(struct comedi_device * dev);
static int pci171x_ai_cancel(comedi_device * dev, comedi_subdevice * s); static int pci171x_ai_cancel(struct comedi_device * dev, 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
/* /*
============================================================================== ==============================================================================
*/ */
static int pci171x_insn_read_ai(comedi_device * dev, comedi_subdevice * s, static int pci171x_insn_read_ai(struct comedi_device * dev, 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(comedi_device * dev, comedi_subdevice * s,
/* /*
============================================================================== ==============================================================================
*/ */
static int pci171x_insn_write_ao(comedi_device * dev, comedi_subdevice * s, static int pci171x_insn_write_ao(struct comedi_device * dev, 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(comedi_device * dev, comedi_subdevice * s,
/* /*
============================================================================== ==============================================================================
*/ */
static int pci171x_insn_read_ao(comedi_device * dev, comedi_subdevice * s, static int pci171x_insn_read_ao(struct comedi_device * dev, 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(comedi_device * dev, comedi_subdevice * s,
/* /*
============================================================================== ==============================================================================
*/ */
static int pci171x_insn_bits_di(comedi_device * dev, comedi_subdevice * s, static int pci171x_insn_bits_di(struct comedi_device * dev, 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(comedi_device * dev, comedi_subdevice * s,
/* /*
============================================================================== ==============================================================================
*/ */
static int pci171x_insn_bits_do(comedi_device * dev, comedi_subdevice * s, static int pci171x_insn_bits_do(struct comedi_device * dev, 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(comedi_device * dev, comedi_subdevice * s,
/* /*
============================================================================== ==============================================================================
*/ */
static int pci171x_insn_counter_read(comedi_device * dev, comedi_subdevice * s, static int pci171x_insn_counter_read(struct comedi_device * dev, 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(comedi_device * dev, comedi_subdevice * s,
/* /*
============================================================================== ==============================================================================
*/ */
static int pci171x_insn_counter_write(comedi_device * dev, comedi_subdevice * s, static int pci171x_insn_counter_write(struct comedi_device * dev, 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;
@ -512,7 +512,7 @@ static int pci171x_insn_counter_write(comedi_device * dev, comedi_subdevice * s,
/* /*
============================================================================== ==============================================================================
*/ */
static int pci171x_insn_counter_config(comedi_device * dev, static int pci171x_insn_counter_config(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
#ifdef unused #ifdef unused
@ -548,7 +548,7 @@ static int pci171x_insn_counter_config(comedi_device * dev,
/* /*
============================================================================== ==============================================================================
*/ */
static int pci1720_insn_write_ao(comedi_device * dev, comedi_subdevice * s, static int pci1720_insn_write_ao(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
int n, rangereg, chan; int n, rangereg, chan;
@ -576,7 +576,7 @@ static int pci1720_insn_write_ao(comedi_device * dev, comedi_subdevice * s,
*/ */
static void interrupt_pci1710_every_sample(void *d) static void interrupt_pci1710_every_sample(void *d)
{ {
comedi_device *dev = d; struct comedi_device *dev = d;
comedi_subdevice *s = dev->subdevices + 0; comedi_subdevice *s = dev->subdevices + 0;
int m; int m;
#ifdef PCI171x_PARANOIDCHECK #ifdef PCI171x_PARANOIDCHECK
@ -659,7 +659,7 @@ static void interrupt_pci1710_every_sample(void *d)
/* /*
============================================================================== ==============================================================================
*/ */
static int move_block_from_fifo(comedi_device * dev, comedi_subdevice * s, static int move_block_from_fifo(struct comedi_device * dev, comedi_subdevice * s,
int n, int turn) int n, int turn)
{ {
int i, j; int i, j;
@ -707,7 +707,7 @@ static int move_block_from_fifo(comedi_device * dev, comedi_subdevice * s,
*/ */
static void interrupt_pci1710_half_fifo(void *d) static void interrupt_pci1710_half_fifo(void *d)
{ {
comedi_device *dev = d; struct comedi_device *dev = d;
comedi_subdevice *s = dev->subdevices + 0; comedi_subdevice *s = dev->subdevices + 0;
int m, samplesinbuf; int m, samplesinbuf;
@ -762,7 +762,7 @@ static void interrupt_pci1710_half_fifo(void *d)
*/ */
static irqreturn_t interrupt_service_pci1710(int irq, void *d PT_REGS_ARG) static irqreturn_t interrupt_service_pci1710(int irq, void *d PT_REGS_ARG)
{ {
comedi_device *dev = d; struct comedi_device *dev = d;
DPRINTK("adv_pci1710 EDBG: BGN: interrupt_service_pci1710(%d,...)\n", DPRINTK("adv_pci1710 EDBG: BGN: interrupt_service_pci1710(%d,...)\n",
irq); irq);
@ -801,7 +801,7 @@ static irqreturn_t interrupt_service_pci1710(int irq, void *d PT_REGS_ARG)
/* /*
============================================================================== ==============================================================================
*/ */
static int pci171x_ai_docmd_and_mode(int mode, comedi_device * dev, static int pci171x_ai_docmd_and_mode(int mode, struct comedi_device * dev,
comedi_subdevice * s) comedi_subdevice * s)
{ {
unsigned int divisor1, divisor2; unsigned int divisor1, divisor2;
@ -900,7 +900,7 @@ static void pci171x_cmdtest_out(int e, comedi_cmd * cmd)
/* /*
============================================================================== ==============================================================================
*/ */
static int pci171x_ai_cmdtest(comedi_device * dev, comedi_subdevice * s, static int pci171x_ai_cmdtest(struct comedi_device * dev, comedi_subdevice * s,
comedi_cmd * cmd) comedi_cmd * cmd)
{ {
int err = 0; int err = 0;
@ -1065,7 +1065,7 @@ static int pci171x_ai_cmdtest(comedi_device * dev, comedi_subdevice * s,
/* /*
============================================================================== ==============================================================================
*/ */
static int pci171x_ai_cmd(comedi_device * dev, comedi_subdevice * s) static int pci171x_ai_cmd(struct comedi_device * dev, comedi_subdevice * s)
{ {
comedi_cmd *cmd = &s->async->cmd; comedi_cmd *cmd = &s->async->cmd;
@ -1104,7 +1104,7 @@ static int pci171x_ai_cmd(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(comedi_device * dev, comedi_subdevice * s, static int check_channel_list(struct comedi_device * dev, 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(comedi_device * dev, comedi_subdevice * s,
return seglen; return seglen;
} }
static void setup_channel_list(comedi_device * dev, comedi_subdevice * s, static void setup_channel_list(struct comedi_device * dev, 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;
@ -1200,7 +1200,7 @@ static void setup_channel_list(comedi_device * dev, comedi_subdevice * s,
/* /*
============================================================================== ==============================================================================
*/ */
static void start_pacer(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)
{ {
DPRINTK("adv_pci1710 EDBG: BGN: start_pacer(%d,%u,%u)\n", mode, DPRINTK("adv_pci1710 EDBG: BGN: start_pacer(%d,%u,%u)\n", mode,
@ -1220,7 +1220,7 @@ static void start_pacer(comedi_device * dev, int mode, unsigned int divisor1,
/* /*
============================================================================== ==============================================================================
*/ */
static int pci171x_ai_cancel(comedi_device * dev, comedi_subdevice * s) static int pci171x_ai_cancel(struct comedi_device * dev, comedi_subdevice * s)
{ {
DPRINTK("adv_pci1710 EDBG: BGN: pci171x_ai_cancel(...)\n"); DPRINTK("adv_pci1710 EDBG: BGN: pci171x_ai_cancel(...)\n");
@ -1249,7 +1249,7 @@ static int pci171x_ai_cancel(comedi_device * dev, comedi_subdevice * s)
/* /*
============================================================================== ==============================================================================
*/ */
static int pci171x_reset(comedi_device * dev) static int pci171x_reset(struct comedi_device * dev)
{ {
DPRINTK("adv_pci1710 EDBG: BGN: pci171x_reset(...)\n"); DPRINTK("adv_pci1710 EDBG: BGN: pci171x_reset(...)\n");
outw(0x30, dev->iobase + PCI171x_CNTCTRL); outw(0x30, dev->iobase + PCI171x_CNTCTRL);
@ -1279,7 +1279,7 @@ static int pci171x_reset(comedi_device * dev)
/* /*
============================================================================== ==============================================================================
*/ */
static int pci1720_reset(comedi_device * dev) static int pci1720_reset(struct comedi_device * dev)
{ {
DPRINTK("adv_pci1710 EDBG: BGN: pci1720_reset(...)\n"); DPRINTK("adv_pci1710 EDBG: BGN: pci1720_reset(...)\n");
outb(Syncont_SC0, dev->iobase + PCI1720_SYNCONT); // set synchronous output mode outb(Syncont_SC0, dev->iobase + PCI1720_SYNCONT); // set synchronous output mode
@ -1301,7 +1301,7 @@ static int pci1720_reset(comedi_device * dev)
/* /*
============================================================================== ==============================================================================
*/ */
static int pci1710_reset(comedi_device * dev) static int pci1710_reset(struct comedi_device * dev)
{ {
DPRINTK("adv_pci1710 EDBG: BGN: pci1710_reset(...)\n"); DPRINTK("adv_pci1710 EDBG: BGN: pci1710_reset(...)\n");
switch (this_board->cardtype) { switch (this_board->cardtype) {
@ -1316,7 +1316,7 @@ static int pci1710_reset(comedi_device * dev)
/* /*
============================================================================== ==============================================================================
*/ */
static int pci1710_attach(comedi_device * dev, comedi_devconfig * it) static int pci1710_attach(struct comedi_device * dev, comedi_devconfig * it)
{ {
comedi_subdevice *s; comedi_subdevice *s;
int ret, subdev, n_subdevices; int ret, subdev, n_subdevices;
@ -1540,7 +1540,7 @@ static int pci1710_attach(comedi_device * dev, comedi_devconfig * it)
/* /*
============================================================================== ==============================================================================
*/ */
static int pci1710_detach(comedi_device * dev) static int pci1710_detach(struct comedi_device * dev)
{ {
if (dev->private) { if (dev->private) {

18
drivers/staging/comedi/drivers/adv_pci1723.c
View File

@ -143,8 +143,8 @@ MODULE_DEVICE_TABLE(pci, pci1723_pci_table);
* the board, and also about the kernel module that contains * the board, and also about the kernel module that contains
* the device code. * the device code.
*/ */
static int pci1723_attach(comedi_device * dev, comedi_devconfig * it); static int pci1723_attach(struct comedi_device * dev, comedi_devconfig * it);
static int pci1723_detach(comedi_device * dev); static int pci1723_detach(struct comedi_device * dev);
#define n_boardtypes (sizeof(boardtypes)/sizeof(boardtype)) #define n_boardtypes (sizeof(boardtypes)/sizeof(boardtype))
@ -175,7 +175,7 @@ typedef struct {
/* /*
* the pci1723 card reset; * the pci1723 card reset;
*/ */
static int pci1723_reset(comedi_device * dev) static int pci1723_reset(struct comedi_device * dev)
{ {
int i; int i;
DPRINTK("adv_pci1723 EDBG: BGN: pci1723_reset(...)\n"); DPRINTK("adv_pci1723 EDBG: BGN: pci1723_reset(...)\n");
@ -202,7 +202,7 @@ static int pci1723_reset(comedi_device * dev)
return 0; return 0;
} }
static int pci1723_insn_read_ao(comedi_device * dev, comedi_subdevice * s, static int pci1723_insn_read_ao(struct comedi_device * dev, 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(comedi_device * dev, comedi_subdevice * s,
/* /*
analog data output; analog data output;
*/ */
static int pci1723_ao_write_winsn(comedi_device * dev, comedi_subdevice * s, static int pci1723_ao_write_winsn(struct comedi_device * dev, 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(comedi_device * dev, comedi_subdevice * s,
/* /*
digital i/o config/query digital i/o config/query
*/ */
static int pci1723_dio_insn_config(comedi_device * dev, comedi_subdevice * s, static int pci1723_dio_insn_config(struct comedi_device * dev, 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(comedi_device * dev, comedi_subdevice * s,
/* /*
digital i/o bits read/write digital i/o bits read/write
*/ */
static int pci1723_dio_insn_bits(comedi_device * dev, comedi_subdevice * s, static int pci1723_dio_insn_bits(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
if (data[0]) { if (data[0]) {
@ -294,7 +294,7 @@ static int pci1723_dio_insn_bits(comedi_device * dev, comedi_subdevice * s,
* Attach is called by the Comedi core to configure the driver * Attach is called by the Comedi core to configure the driver
* for a pci1723 board. * for a pci1723 board.
*/ */
static int pci1723_attach(comedi_device * dev, comedi_devconfig * it) static int pci1723_attach(struct comedi_device * dev, comedi_devconfig * it)
{ {
comedi_subdevice *s; comedi_subdevice *s;
int ret, subdev, n_subdevices; int ret, subdev, n_subdevices;
@ -439,7 +439,7 @@ static int pci1723_attach(comedi_device * dev, comedi_devconfig * it)
* allocated by _attach(). dev->private and dev->subdevices are * allocated by _attach(). dev->private and dev->subdevices are
* deallocated automatically by the core. * deallocated automatically by the core.
*/ */
static int pci1723_detach(comedi_device * dev) static int pci1723_detach(struct comedi_device * dev)
{ {
printk("comedi%d: pci1723: remove\n", dev->minor); printk("comedi%d: pci1723: remove\n", dev->minor);

42
drivers/staging/comedi/drivers/adv_pci_dio.c
View File

@ -183,8 +183,8 @@ typedef enum {
#define OMBCMD_RETRY 0x03 /* 3 times try request before error */ #define OMBCMD_RETRY 0x03 /* 3 times try request before error */
static int pci_dio_attach(comedi_device * dev, comedi_devconfig * it); static int pci_dio_attach(struct comedi_device * dev, comedi_devconfig * it);
static int pci_dio_detach(comedi_device * dev); static int pci_dio_detach(struct comedi_device * dev);
typedef struct { typedef struct {
int chans; // num of chans int chans; // num of chans
@ -357,7 +357,7 @@ static pci_dio_private *pci_priv = NULL; /* list of allocated cards */
/* /*
============================================================================== ==============================================================================
*/ */
static int pci_dio_insn_bits_di_b(comedi_device * dev, comedi_subdevice * s, static int pci_dio_insn_bits_di_b(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
const diosubd_data *d = (const diosubd_data *)s->private; const diosubd_data *d = (const diosubd_data *)s->private;
@ -374,7 +374,7 @@ static int pci_dio_insn_bits_di_b(comedi_device * dev, comedi_subdevice * s,
/* /*
============================================================================== ==============================================================================
*/ */
static int pci_dio_insn_bits_di_w(comedi_device * dev, comedi_subdevice * s, static int pci_dio_insn_bits_di_w(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
const diosubd_data *d = (const diosubd_data *)s->private; const diosubd_data *d = (const diosubd_data *)s->private;
@ -390,7 +390,7 @@ static int pci_dio_insn_bits_di_w(comedi_device * dev, comedi_subdevice * s,
/* /*
============================================================================== ==============================================================================
*/ */
static int pci_dio_insn_bits_do_b(comedi_device * dev, comedi_subdevice * s, static int pci_dio_insn_bits_do_b(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
const diosubd_data *d = (const diosubd_data *)s->private; const diosubd_data *d = (const diosubd_data *)s->private;
@ -411,7 +411,7 @@ static int pci_dio_insn_bits_do_b(comedi_device * dev, comedi_subdevice * s,
/* /*
============================================================================== ==============================================================================
*/ */
static int pci_dio_insn_bits_do_w(comedi_device * dev, comedi_subdevice * s, static int pci_dio_insn_bits_do_w(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
const diosubd_data *d = (const diosubd_data *)s->private; const diosubd_data *d = (const diosubd_data *)s->private;
@ -432,7 +432,7 @@ static int pci_dio_insn_bits_do_w(comedi_device * dev, comedi_subdevice * s,
/* /*
============================================================================== ==============================================================================
*/ */
static int pci1760_unchecked_mbxrequest(comedi_device * dev, static int pci1760_unchecked_mbxrequest(struct comedi_device * dev,
unsigned char *omb, unsigned char *imb, int repeats) unsigned char *omb, unsigned char *imb, int repeats)
{ {
int cnt, tout, ok = 0; int cnt, tout, ok = 0;
@ -460,7 +460,7 @@ static int pci1760_unchecked_mbxrequest(comedi_device * dev,
return -ETIME; return -ETIME;
} }
static int pci1760_clear_imb2(comedi_device * dev) static int pci1760_clear_imb2(struct comedi_device * dev)
{ {
unsigned char omb[4] = { 0x0, 0x0, CMD_ClearIMB2, 0x0 }; unsigned char omb[4] = { 0x0, 0x0, CMD_ClearIMB2, 0x0 };
unsigned char imb[4]; unsigned char imb[4];
@ -470,7 +470,7 @@ static int pci1760_clear_imb2(comedi_device * dev)
return pci1760_unchecked_mbxrequest(dev, omb, imb, OMBCMD_RETRY); return pci1760_unchecked_mbxrequest(dev, omb, imb, OMBCMD_RETRY);
} }
static int pci1760_mbxrequest(comedi_device * dev, static int pci1760_mbxrequest(struct comedi_device * dev,
unsigned char *omb, unsigned char *imb) unsigned char *omb, unsigned char *imb)
{ {
if (omb[2] == CMD_ClearIMB2) { if (omb[2] == CMD_ClearIMB2) {
@ -490,7 +490,7 @@ static int pci1760_mbxrequest(comedi_device * dev,
/* /*
============================================================================== ==============================================================================
*/ */
static int pci1760_insn_bits_di(comedi_device * dev, comedi_subdevice * s, static int pci1760_insn_bits_di(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
data[1] = inb(dev->iobase + IMB3); data[1] = inb(dev->iobase + IMB3);
@ -501,7 +501,7 @@ static int pci1760_insn_bits_di(comedi_device * dev, comedi_subdevice * s,
/* /*
============================================================================== ==============================================================================
*/ */
static int pci1760_insn_bits_do(comedi_device * dev, comedi_subdevice * s, static int pci1760_insn_bits_do(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
int ret; int ret;
@ -528,7 +528,7 @@ static int pci1760_insn_bits_do(comedi_device * dev, comedi_subdevice * s,
/* /*
============================================================================== ==============================================================================
*/ */
static int pci1760_insn_cnt_read(comedi_device * dev, comedi_subdevice * s, static int pci1760_insn_cnt_read(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
int ret, n; int ret, n;
@ -552,7 +552,7 @@ static int pci1760_insn_cnt_read(comedi_device * dev, comedi_subdevice * s,
/* /*
============================================================================== ==============================================================================
*/ */
static int pci1760_insn_cnt_write(comedi_device * dev, comedi_subdevice * s, static int pci1760_insn_cnt_write(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
int ret; int ret;
@ -590,7 +590,7 @@ static int pci1760_insn_cnt_write(comedi_device * dev, comedi_subdevice * s,
/* /*
============================================================================== ==============================================================================
*/ */
static int pci1760_reset(comedi_device * dev) static int pci1760_reset(struct comedi_device * dev)
{ {
int i; int i;
unsigned char omb[4] = { 0x00, 0x00, 0x00, 0x00 }; unsigned char omb[4] = { 0x00, 0x00, 0x00, 0x00 };
@ -667,7 +667,7 @@ static int pci1760_reset(comedi_device * dev)
/* /*
============================================================================== ==============================================================================
*/ */
static int pci_dio_reset(comedi_device * dev) static int pci_dio_reset(struct comedi_device * dev)
{ {
DPRINTK("adv_pci_dio EDBG: BGN: pci171x_reset(...)\n"); DPRINTK("adv_pci_dio EDBG: BGN: pci171x_reset(...)\n");
@ -750,7 +750,7 @@ static int pci_dio_reset(comedi_device * dev)
/* /*
============================================================================== ==============================================================================
*/ */
static int pci1760_attach(comedi_device * dev, comedi_devconfig * it) static int pci1760_attach(struct comedi_device * dev, comedi_devconfig * it)
{ {
comedi_subdevice *s; comedi_subdevice *s;
int subdev = 0; int subdev = 0;
@ -802,7 +802,7 @@ static int pci1760_attach(comedi_device * dev, comedi_devconfig * it)
/* /*
============================================================================== ==============================================================================
*/ */
static int pci_dio_add_di(comedi_device * dev, comedi_subdevice * s, static int pci_dio_add_di(struct comedi_device * dev, comedi_subdevice * s,
const diosubd_data * d, int subdev) const diosubd_data * d, int subdev)
{ {
s->type = COMEDI_SUBD_DI; s->type = COMEDI_SUBD_DI;
@ -829,7 +829,7 @@ static int pci_dio_add_di(comedi_device * dev, comedi_subdevice * s,
/* /*
============================================================================== ==============================================================================
*/ */
static int pci_dio_add_do(comedi_device * dev, comedi_subdevice * s, static int pci_dio_add_do(struct comedi_device * dev, comedi_subdevice * s,
const diosubd_data * d, int subdev) const diosubd_data * d, int subdev)
{ {
s->type = COMEDI_SUBD_DO; s->type = COMEDI_SUBD_DO;
@ -857,7 +857,7 @@ static int pci_dio_add_do(comedi_device * dev, comedi_subdevice * s,
/* /*
============================================================================== ==============================================================================
*/ */
static int CheckAndAllocCard(comedi_device * dev, comedi_devconfig * it, static int CheckAndAllocCard(struct comedi_device * dev, comedi_devconfig * it,
struct pci_dev *pcidev) struct pci_dev *pcidev)
{ {
pci_dio_private *pr, *prev; pci_dio_private *pr, *prev;
@ -883,7 +883,7 @@ static int CheckAndAllocCard(comedi_device * dev, comedi_devconfig * it,
/* /*
============================================================================== ==============================================================================
*/ */
static int pci_dio_attach(comedi_device * dev, comedi_devconfig * it) static int pci_dio_attach(struct comedi_device * dev, comedi_devconfig * it)
{ {
comedi_subdevice *s; comedi_subdevice *s;
int ret, subdev, n_subdevices, i, j; int ret, subdev, n_subdevices, i, j;
@ -1011,7 +1011,7 @@ static int pci_dio_attach(comedi_device * dev, comedi_devconfig * it)
/* /*
============================================================================== ==============================================================================
*/ */
static int pci_dio_detach(comedi_device * dev) static int pci_dio_detach(struct comedi_device * dev)
{ {
int i, j; int i, j;
comedi_subdevice *s; comedi_subdevice *s;

10
drivers/staging/comedi/drivers/aio_aio12_8.c
View File

@ -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(comedi_device * dev, comedi_subdevice * s, static int aio_aio12_8_ai_read(struct comedi_device * dev, 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(comedi_device * dev, comedi_subdevice * s,
return n; return n;
} }
static int aio_aio12_8_ao_read(comedi_device * dev, comedi_subdevice * s, static int aio_aio12_8_ao_read(struct comedi_device * dev, 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(comedi_device * dev, comedi_subdevice * s,
return insn->n; return insn->n;
} }
static int aio_aio12_8_ao_write(comedi_device * dev, comedi_subdevice * s, static int aio_aio12_8_ao_write(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
int i; int i;
@ -161,7 +161,7 @@ static const comedi_lrange range_aio_aio12_8 = {
} }
}; };
static int aio_aio12_8_attach(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; comedi_subdevice *s;
@ -205,7 +205,7 @@ static int aio_aio12_8_attach(comedi_device * dev, comedi_devconfig * it)
return 0; return 0;
} }
static int aio_aio12_8_detach(comedi_device * dev) static int aio_aio12_8_detach(struct comedi_device * dev)
{ {
subdev_8255_cleanup(dev, &dev->subdevices[2]); subdev_8255_cleanup(dev, &dev->subdevices[2]);
if (dev->iobase) if (dev->iobase)

16
drivers/staging/comedi/drivers/aio_iiro_16.c
View File

@ -67,9 +67,9 @@ typedef struct {
#define devpriv ((aio_iiro_16_private *) dev->private) #define devpriv ((aio_iiro_16_private *) dev->private)
static int aio_iiro_16_attach(comedi_device * dev, comedi_devconfig * it); static int aio_iiro_16_attach(struct comedi_device * dev, comedi_devconfig * it);
static int aio_iiro_16_detach(comedi_device * dev); static int aio_iiro_16_detach(struct comedi_device * dev);
static comedi_driver driver_aio_iiro_16 = { static comedi_driver driver_aio_iiro_16 = {
driver_name:"aio_iiro_16", driver_name:"aio_iiro_16",
@ -81,13 +81,13 @@ static comedi_driver driver_aio_iiro_16 = {
num_names:sizeof(aio_iiro_16_boards) / sizeof(aio_iiro_16_board), num_names:sizeof(aio_iiro_16_boards) / sizeof(aio_iiro_16_board),
}; };
static int aio_iiro_16_dio_insn_bits_read(comedi_device * dev, static int aio_iiro_16_dio_insn_bits_read(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data); comedi_subdevice * s, comedi_insn * insn, unsigned int * data);
static int aio_iiro_16_dio_insn_bits_write(comedi_device * dev, static int aio_iiro_16_dio_insn_bits_write(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data); comedi_subdevice * s, comedi_insn * insn, unsigned int * data);
static int aio_iiro_16_attach(comedi_device * dev, comedi_devconfig * it) static int aio_iiro_16_attach(struct comedi_device * dev, comedi_devconfig * it)
{ {
int iobase; int iobase;
comedi_subdevice *s; comedi_subdevice *s;
@ -132,7 +132,7 @@ static int aio_iiro_16_attach(comedi_device * dev, comedi_devconfig * it)
return 1; return 1;
} }
static int aio_iiro_16_detach(comedi_device * dev) static int aio_iiro_16_detach(struct comedi_device * dev)
{ {
printk("comedi%d: aio_iiro_16: remove\n", dev->minor); printk("comedi%d: aio_iiro_16: remove\n", dev->minor);
@ -142,7 +142,7 @@ static int aio_iiro_16_detach(comedi_device * dev)
return 0; return 0;
} }
static int aio_iiro_16_dio_insn_bits_write(comedi_device * dev, static int aio_iiro_16_dio_insn_bits_write(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
if (insn->n != 2) if (insn->n != 2)
@ -161,7 +161,7 @@ static int aio_iiro_16_dio_insn_bits_write(comedi_device * dev,
return 2; return 2;
} }
static int aio_iiro_16_dio_insn_bits_read(comedi_device * dev, static int aio_iiro_16_dio_insn_bits_read(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
if (insn->n != 2) if (insn->n != 2)

44
drivers/staging/comedi/drivers/amplc_dio200.c
View File

@ -436,7 +436,7 @@ MODULE_DEVICE_TABLE(pci, dio200_pci_table);
/* this structure is for data unique to this hardware driver. If /* this structure is for data unique to this hardware driver. If
several hardware drivers keep similar information in this structure, several hardware drivers keep similar information in this structure,
feel free to suggest moving the variable to the comedi_device struct. */ feel free to suggest moving the variable to the struct comedi_device struct. */
typedef struct { typedef struct {
#ifdef CONFIG_COMEDI_PCI #ifdef CONFIG_COMEDI_PCI
struct pci_dev *pci_dev; /* PCI device */ struct pci_dev *pci_dev; /* PCI device */
@ -473,8 +473,8 @@ typedef struct {
* the board, and also about the kernel module that contains * the board, and also about the kernel module that contains
* the device code. * the device code.
*/ */
static int dio200_attach(comedi_device * dev, comedi_devconfig * it); static int dio200_attach(struct comedi_device * dev, comedi_devconfig * it);
static int dio200_detach(comedi_device * dev); static int dio200_detach(struct comedi_device * dev);
static comedi_driver driver_amplc_dio200 = { static comedi_driver driver_amplc_dio200 = {
driver_name:DIO200_DRIVER_NAME, driver_name:DIO200_DRIVER_NAME,
module:THIS_MODULE, module:THIS_MODULE,
@ -497,7 +497,7 @@ COMEDI_INITCLEANUP(driver_amplc_dio200);
*/ */
#ifdef CONFIG_COMEDI_PCI #ifdef CONFIG_COMEDI_PCI
static int static int
dio200_find_pci(comedi_device * dev, int bus, int slot, dio200_find_pci(struct comedi_device * dev, int bus, int slot,
struct pci_dev **pci_dev_p) struct pci_dev **pci_dev_p)
{ {
struct pci_dev *pci_dev = NULL; struct pci_dev *pci_dev = NULL;
@ -572,7 +572,7 @@ dio200_request_region(unsigned minor, unsigned long from, unsigned long extent)
* 'insn_bits' function for an 'INTERRUPT' subdevice. * 'insn_bits' function for an 'INTERRUPT' subdevice.
*/ */
static int static int
dio200_subdev_intr_insn_bits(comedi_device * dev, comedi_subdevice * s, dio200_subdev_intr_insn_bits(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
dio200_subdev_intr *subpriv = s->private; dio200_subdev_intr *subpriv = s->private;
@ -591,7 +591,7 @@ dio200_subdev_intr_insn_bits(comedi_device * dev, comedi_subdevice * s,
/* /*
* Called to stop acquisition for an 'INTERRUPT' subdevice. * Called to stop acquisition for an 'INTERRUPT' subdevice.
*/ */
static void dio200_stop_intr(comedi_device * dev, comedi_subdevice * s) static void dio200_stop_intr(struct comedi_device * dev, comedi_subdevice * s)
{ {
dio200_subdev_intr *subpriv = s->private; dio200_subdev_intr *subpriv = s->private;
@ -605,7 +605,7 @@ static void dio200_stop_intr(comedi_device * dev, comedi_subdevice * s)
/* /*
* Called to start acquisition for an 'INTERRUPT' subdevice. * Called to start acquisition for an 'INTERRUPT' subdevice.
*/ */
static int dio200_start_intr(comedi_device * dev, comedi_subdevice * s) static int dio200_start_intr(struct comedi_device * dev, comedi_subdevice * s)
{ {
unsigned int n; unsigned int n;
unsigned isn_bits; unsigned isn_bits;
@ -641,7 +641,7 @@ static int dio200_start_intr(comedi_device * dev, comedi_subdevice * s)
* Internal trigger function to start acquisition for an 'INTERRUPT' subdevice. * Internal trigger function to start acquisition for an 'INTERRUPT' subdevice.
*/ */
static int static int
dio200_inttrig_start_intr(comedi_device * dev, comedi_subdevice * s, dio200_inttrig_start_intr(struct comedi_device * dev, comedi_subdevice * s,
unsigned int trignum) unsigned int trignum)
{ {
dio200_subdev_intr *subpriv; dio200_subdev_intr *subpriv;
@ -671,7 +671,7 @@ dio200_inttrig_start_intr(comedi_device * dev, comedi_subdevice * s,
* This is called from the interrupt service routine to handle a read * This is called from the interrupt service routine to handle a read
* scan on an 'INTERRUPT' subdevice. * scan on an 'INTERRUPT' subdevice.
*/ */
static int dio200_handle_read_intr(comedi_device * dev, comedi_subdevice * s) static int dio200_handle_read_intr(struct comedi_device * dev, comedi_subdevice * s)
{ {
dio200_subdev_intr *subpriv = s->private; dio200_subdev_intr *subpriv = s->private;
unsigned triggered; unsigned triggered;
@ -783,7 +783,7 @@ static int dio200_handle_read_intr(comedi_device * dev, comedi_subdevice * s)
/* /*
* 'cancel' function for an 'INTERRUPT' subdevice. * 'cancel' function for an 'INTERRUPT' subdevice.
*/ */
static int dio200_subdev_intr_cancel(comedi_device * dev, comedi_subdevice * s) static int dio200_subdev_intr_cancel(struct comedi_device * dev, comedi_subdevice * s)
{ {
dio200_subdev_intr *subpriv = s->private; dio200_subdev_intr *subpriv = s->private;
unsigned long flags; unsigned long flags;
@ -801,7 +801,7 @@ static int dio200_subdev_intr_cancel(comedi_device * dev, comedi_subdevice * s)
* 'do_cmdtest' function for an 'INTERRUPT' subdevice. * 'do_cmdtest' function for an 'INTERRUPT' subdevice.
*/ */
static int static int
dio200_subdev_intr_cmdtest(comedi_device * dev, comedi_subdevice * s, dio200_subdev_intr_cmdtest(struct comedi_device * dev, comedi_subdevice * s,
comedi_cmd * cmd) comedi_cmd * cmd)
{ {
int err = 0; int err = 0;
@ -907,7 +907,7 @@ dio200_subdev_intr_cmdtest(comedi_device * dev, comedi_subdevice * s,
/* /*
* 'do_cmd' function for an 'INTERRUPT' subdevice. * 'do_cmd' function for an 'INTERRUPT' subdevice.
*/ */
static int dio200_subdev_intr_cmd(comedi_device * dev, comedi_subdevice * s) static int dio200_subdev_intr_cmd(struct comedi_device * dev, comedi_subdevice * s)
{ {
comedi_cmd *cmd = &s->async->cmd; comedi_cmd *cmd = &s->async->cmd;
dio200_subdev_intr *subpriv = s->private; dio200_subdev_intr *subpriv = s->private;
@ -953,7 +953,7 @@ static int dio200_subdev_intr_cmd(comedi_device * dev, comedi_subdevice * s)
* This function initializes an 'INTERRUPT' subdevice. * This function initializes an 'INTERRUPT' subdevice.
*/ */
static int static int
dio200_subdev_intr_init(comedi_device * dev, comedi_subdevice * s, dio200_subdev_intr_init(struct comedi_device * dev, comedi_subdevice * s,
unsigned long iobase, unsigned valid_isns, int has_int_sce) unsigned long iobase, unsigned valid_isns, int has_int_sce)
{ {
dio200_subdev_intr *subpriv; dio200_subdev_intr *subpriv;
@ -998,7 +998,7 @@ dio200_subdev_intr_init(comedi_device * dev, comedi_subdevice * s,
* This function cleans up an 'INTERRUPT' subdevice. * This function cleans up an 'INTERRUPT' subdevice.
*/ */
static void static void
dio200_subdev_intr_cleanup(comedi_device * dev, comedi_subdevice * s) dio200_subdev_intr_cleanup(struct comedi_device * dev, comedi_subdevice * s)
{ {
dio200_subdev_intr *subpriv = s->private; dio200_subdev_intr *subpriv = s->private;
@ -1012,7 +1012,7 @@ dio200_subdev_intr_cleanup(comedi_device * dev, comedi_subdevice * s)
*/ */
static irqreturn_t dio200_interrupt(int irq, void *d PT_REGS_ARG) static irqreturn_t dio200_interrupt(int irq, void *d PT_REGS_ARG)
{ {
comedi_device *dev = d; struct comedi_device *dev = d;
int handled; int handled;
if (!dev->attached) { if (!dev->attached) {
@ -1033,7 +1033,7 @@ static irqreturn_t dio200_interrupt(int irq, void *d PT_REGS_ARG)
* Handle 'insn_read' for an '8254' counter subdevice. * Handle 'insn_read' for an '8254' counter subdevice.
*/ */
static int static int
dio200_subdev_8254_read(comedi_device * dev, comedi_subdevice * s, dio200_subdev_8254_read(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
dio200_subdev_8254 *subpriv = s->private; dio200_subdev_8254 *subpriv = s->private;
@ -1048,7 +1048,7 @@ dio200_subdev_8254_read(comedi_device * dev, comedi_subdevice * s,
* Handle 'insn_write' for an '8254' counter subdevice. * Handle 'insn_write' for an '8254' counter subdevice.
*/ */
static int static int
dio200_subdev_8254_write(comedi_device * dev, comedi_subdevice * s, dio200_subdev_8254_write(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
dio200_subdev_8254 *subpriv = s->private; dio200_subdev_8254 *subpriv = s->private;
@ -1142,7 +1142,7 @@ dio200_get_clock_src(dio200_subdev_8254 * subpriv, unsigned int counter_number,
* Handle 'insn_config' for an '8254' counter subdevice. * Handle 'insn_config' for an '8254' counter subdevice.
*/ */
static int static int
dio200_subdev_8254_config(comedi_device * dev, comedi_subdevice * s, dio200_subdev_8254_config(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
dio200_subdev_8254 *subpriv = s->private; dio200_subdev_8254 *subpriv = s->private;
@ -1194,7 +1194,7 @@ dio200_subdev_8254_config(comedi_device * dev, comedi_subdevice * s,
* offset is the offset to the 8254 chip. * offset is the offset to the 8254 chip.
*/ */
static int static int
dio200_subdev_8254_init(comedi_device * dev, comedi_subdevice * s, dio200_subdev_8254_init(struct comedi_device * dev, comedi_subdevice * s,
unsigned long iobase, unsigned offset, int has_clk_gat_sce) unsigned long iobase, unsigned offset, int has_clk_gat_sce)
{ {
dio200_subdev_8254 *subpriv; dio200_subdev_8254 *subpriv;
@ -1247,7 +1247,7 @@ dio200_subdev_8254_init(comedi_device * dev, comedi_subdevice * s,
* This function cleans up an '8254' counter subdevice. * This function cleans up an '8254' counter subdevice.
*/ */
static void static void
dio200_subdev_8254_cleanup(comedi_device * dev, comedi_subdevice * s) dio200_subdev_8254_cleanup(struct comedi_device * dev, comedi_subdevice * s)
{ {
dio200_subdev_intr *subpriv = s->private; dio200_subdev_intr *subpriv = s->private;
@ -1262,7 +1262,7 @@ dio200_subdev_8254_cleanup(comedi_device * dev, comedi_subdevice * s)
* in the driver structure, dev->board_ptr contains that * in the driver structure, dev->board_ptr contains that
* address. * address.
*/ */
static int dio200_attach(comedi_device * dev, comedi_devconfig * it) static int dio200_attach(struct comedi_device * dev, comedi_devconfig * it)
{ {
comedi_subdevice *s; comedi_subdevice *s;
unsigned long iobase = 0; unsigned long iobase = 0;
@ -1429,7 +1429,7 @@ static int dio200_attach(comedi_device * dev, comedi_devconfig * it)
* allocated by _attach(). dev->private and dev->subdevices are * allocated by _attach(). dev->private and dev->subdevices are
* deallocated automatically by the core. * deallocated automatically by the core.
*/ */
static int dio200_detach(comedi_device * dev) static int dio200_detach(struct comedi_device * dev)
{ {
const dio200_layout *layout; const dio200_layout *layout;
unsigned n; unsigned n;

42
drivers/staging/comedi/drivers/amplc_pc236.c
View File

@ -147,7 +147,7 @@ MODULE_DEVICE_TABLE(pci, pc236_pci_table);
/* this structure is for data unique to this hardware driver. If /* this structure is for data unique to this hardware driver. If
several hardware drivers keep similar information in this structure, several hardware drivers keep similar information in this structure,
feel free to suggest moving the variable to the comedi_device struct. */ feel free to suggest moving the variable to the struct comedi_device struct. */
typedef struct { typedef struct {
#ifdef CONFIG_COMEDI_PCI #ifdef CONFIG_COMEDI_PCI
/* PCI device */ /* PCI device */
@ -165,8 +165,8 @@ typedef struct {
* the board, and also about the kernel module that contains * the board, and also about the kernel module that contains
* the device code. * the device code.
*/ */
static int pc236_attach(comedi_device * dev, comedi_devconfig * it); static int pc236_attach(struct comedi_device * dev, comedi_devconfig * it);
static int pc236_detach(comedi_device * dev); static int pc236_detach(struct comedi_device * dev);
static comedi_driver driver_amplc_pc236 = { static comedi_driver driver_amplc_pc236 = {
driver_name:PC236_DRIVER_NAME, driver_name:PC236_DRIVER_NAME,
module:THIS_MODULE, module:THIS_MODULE,
@ -185,15 +185,15 @@ COMEDI_INITCLEANUP(driver_amplc_pc236);
static int pc236_request_region(unsigned minor, unsigned long from, static int pc236_request_region(unsigned minor, unsigned long from,
unsigned long extent); unsigned long extent);
static void pc236_intr_disable(comedi_device * dev); static void pc236_intr_disable(struct comedi_device * dev);
static void pc236_intr_enable(comedi_device * dev); static void pc236_intr_enable(struct comedi_device * dev);
static int pc236_intr_check(comedi_device * dev); static int pc236_intr_check(struct comedi_device * dev);
static int pc236_intr_insn(comedi_device * dev, comedi_subdevice * s, static int pc236_intr_insn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int pc236_intr_cmdtest(comedi_device * dev, comedi_subdevice * s, static int pc236_intr_cmdtest(struct comedi_device * dev, comedi_subdevice * s,
comedi_cmd * cmd); comedi_cmd * cmd);
static int pc236_intr_cmd(comedi_device * dev, comedi_subdevice * s); static int pc236_intr_cmd(struct comedi_device * dev, comedi_subdevice * s);
static int pc236_intr_cancel(comedi_device * dev, comedi_subdevice * s); static int pc236_intr_cancel(struct comedi_device * dev, comedi_subdevice * s);
static irqreturn_t pc236_interrupt(int irq, void *d PT_REGS_ARG); static irqreturn_t pc236_interrupt(int irq, void *d PT_REGS_ARG);
/* /*
@ -202,7 +202,7 @@ static irqreturn_t pc236_interrupt(int irq, void *d PT_REGS_ARG);
*/ */
#ifdef CONFIG_COMEDI_PCI #ifdef CONFIG_COMEDI_PCI
static int static int
pc236_find_pci(comedi_device * dev, int bus, int slot, pc236_find_pci(struct comedi_device * dev, int bus, int slot,
struct pci_dev **pci_dev_p) struct pci_dev **pci_dev_p)
{ {
struct pci_dev *pci_dev = NULL; struct pci_dev *pci_dev = NULL;
@ -264,7 +264,7 @@ pc236_find_pci(comedi_device * dev, int bus, int slot,
* in the driver structure, dev->board_ptr contains that * in the driver structure, dev->board_ptr contains that
* address. * address.
*/ */
static int pc236_attach(comedi_device * dev, comedi_devconfig * it) static int pc236_attach(struct comedi_device * dev, comedi_devconfig * it)
{ {
comedi_subdevice *s; comedi_subdevice *s;
unsigned long iobase = 0; unsigned long iobase = 0;
@ -405,7 +405,7 @@ static int pc236_attach(comedi_device * dev, comedi_devconfig * it)
* allocated by _attach(). dev->private and dev->subdevices are * allocated by _attach(). dev->private and dev->subdevices are
* deallocated automatically by the core. * deallocated automatically by the core.
*/ */
static int pc236_detach(comedi_device * dev) static int pc236_detach(struct comedi_device * dev)
{ {
printk(KERN_DEBUG "comedi%d: %s: detach\n", dev->minor, printk(KERN_DEBUG "comedi%d: %s: detach\n", dev->minor,
PC236_DRIVER_NAME); PC236_DRIVER_NAME);
@ -459,7 +459,7 @@ static int pc236_request_region(unsigned minor, unsigned long from,
* configured on subdevice 1) and to physically disable the interrupt * configured on subdevice 1) and to physically disable the interrupt
* (not possible on the PC36AT, except by removing the IRQ jumper!). * (not possible on the PC36AT, except by removing the IRQ jumper!).
*/ */
static void pc236_intr_disable(comedi_device * dev) static void pc236_intr_disable(struct comedi_device * dev)
{ {
unsigned long flags; unsigned long flags;
@ -477,7 +477,7 @@ static void pc236_intr_disable(comedi_device * dev)
* configured on subdevice 1) and to physically enable the interrupt * configured on subdevice 1) and to physically enable the interrupt
* (not possible on the PC36AT, except by (re)connecting the IRQ jumper!). * (not possible on the PC36AT, except by (re)connecting the IRQ jumper!).
*/ */
static void pc236_intr_enable(comedi_device * dev) static void pc236_intr_enable(struct comedi_device * dev)
{ {
unsigned long flags; unsigned long flags;
@ -497,7 +497,7 @@ static void pc236_intr_enable(comedi_device * dev)
* interrupt. * interrupt.
* Returns 0 if the interrupt should be ignored. * Returns 0 if the interrupt should be ignored.
*/ */
static int pc236_intr_check(comedi_device * dev) static int pc236_intr_check(struct comedi_device * dev)
{ {
int retval = 0; int retval = 0;
unsigned long flags; unsigned long flags;
@ -528,7 +528,7 @@ static int pc236_intr_check(comedi_device * dev)
* Input from subdevice 1. * Input from subdevice 1.
* Copied from the comedi_parport driver. * Copied from the comedi_parport driver.
*/ */
static int pc236_intr_insn(comedi_device * dev, comedi_subdevice * s, static int pc236_intr_insn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
data[1] = 0; data[1] = 0;
@ -539,7 +539,7 @@ static int pc236_intr_insn(comedi_device * dev, comedi_subdevice * s,
* Subdevice 1 command test. * Subdevice 1 command test.
* Copied from the comedi_parport driver. * Copied from the comedi_parport driver.
*/ */
static int pc236_intr_cmdtest(comedi_device * dev, comedi_subdevice * s, static int pc236_intr_cmdtest(struct comedi_device * dev, comedi_subdevice * s,
comedi_cmd * cmd) comedi_cmd * cmd)
{ {
int err = 0; int err = 0;
@ -617,7 +617,7 @@ static int pc236_intr_cmdtest(comedi_device * dev, comedi_subdevice * s,
/* /*
* Subdevice 1 command. * Subdevice 1 command.
*/ */
static int pc236_intr_cmd(comedi_device * dev, comedi_subdevice * s) static int pc236_intr_cmd(struct comedi_device * dev, comedi_subdevice * s)
{ {
pc236_intr_enable(dev); pc236_intr_enable(dev);
@ -627,7 +627,7 @@ static int pc236_intr_cmd(comedi_device * dev, comedi_subdevice * s)
/* /*
* Subdevice 1 cancel command. * Subdevice 1 cancel command.
*/ */
static int pc236_intr_cancel(comedi_device * dev, comedi_subdevice * s) static int pc236_intr_cancel(struct comedi_device * dev, comedi_subdevice * s)
{ {
pc236_intr_disable(dev); pc236_intr_disable(dev);
@ -640,7 +640,7 @@ static int pc236_intr_cancel(comedi_device * dev, comedi_subdevice * s)
*/ */
static irqreturn_t pc236_interrupt(int irq, void *d PT_REGS_ARG) static irqreturn_t pc236_interrupt(int irq, void *d PT_REGS_ARG)
{ {
comedi_device *dev = d; struct comedi_device *dev = d;
comedi_subdevice *s = dev->subdevices + 1; comedi_subdevice *s = dev->subdevices + 1;
int handled; int handled;

20
drivers/staging/comedi/drivers/amplc_pc263.c
View File

@ -116,7 +116,7 @@ MODULE_DEVICE_TABLE(pci, pc263_pci_table);
/* this structure is for data unique to this hardware driver. If /* this structure is for data unique to this hardware driver. If
several hardware drivers keep similar information in this structure, several hardware drivers keep similar information in this structure,
feel free to suggest moving the variable to the comedi_device struct. */ feel free to suggest moving the variable to the struct comedi_device struct. */
#ifdef CONFIG_COMEDI_PCI #ifdef CONFIG_COMEDI_PCI
typedef struct { typedef struct {
/* PCI device. */ /* PCI device. */
@ -132,8 +132,8 @@ typedef struct {
* the board, and also about the kernel module that contains * the board, and also about the kernel module that contains
* the device code. * the device code.
*/ */
static int pc263_attach(comedi_device * dev, comedi_devconfig * it); static int pc263_attach(struct comedi_device * dev, comedi_devconfig * it);
static int pc263_detach(comedi_device * dev); static int pc263_detach(struct comedi_device * dev);
static comedi_driver driver_amplc_pc263 = { static comedi_driver driver_amplc_pc263 = {
driver_name:PC263_DRIVER_NAME, driver_name:PC263_DRIVER_NAME,
module:THIS_MODULE, module:THIS_MODULE,
@ -146,9 +146,9 @@ static comedi_driver driver_amplc_pc263 = {
static int pc263_request_region(unsigned minor, unsigned long from, static int pc263_request_region(unsigned minor, unsigned long from,
unsigned long extent); unsigned long extent);
static int pc263_dio_insn_bits(comedi_device * dev, comedi_subdevice * s, static int pc263_dio_insn_bits(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int pc263_dio_insn_config(comedi_device * dev, comedi_subdevice * s, static int pc263_dio_insn_config(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
/* /*
@ -157,7 +157,7 @@ static int pc263_dio_insn_config(comedi_device * dev, comedi_subdevice * s,
*/ */
#ifdef CONFIG_COMEDI_PCI #ifdef CONFIG_COMEDI_PCI
static int static int
pc263_find_pci(comedi_device * dev, int bus, int slot, pc263_find_pci(struct comedi_device * dev, int bus, int slot,
struct pci_dev **pci_dev_p) struct pci_dev **pci_dev_p)
{ {
struct pci_dev *pci_dev = NULL; struct pci_dev *pci_dev = NULL;
@ -219,7 +219,7 @@ pc263_find_pci(comedi_device * dev, int bus, int slot,
* in the driver structure, dev->board_ptr contains that * in the driver structure, dev->board_ptr contains that
* address. * address.
*/ */
static int pc263_attach(comedi_device * dev, comedi_devconfig * it) static int pc263_attach(struct comedi_device * dev, comedi_devconfig * it)
{ {
comedi_subdevice *s; comedi_subdevice *s;
unsigned long iobase = 0; unsigned long iobase = 0;
@ -337,7 +337,7 @@ static int pc263_attach(comedi_device * dev, comedi_devconfig * it)
* allocated by _attach(). dev->private and dev->subdevices are * allocated by _attach(). dev->private and dev->subdevices are
* deallocated automatically by the core. * deallocated automatically by the core.
*/ */
static int pc263_detach(comedi_device * dev) static int pc263_detach(struct comedi_device * dev)
{ {
printk(KERN_DEBUG "comedi%d: %s: detach\n", dev->minor, printk(KERN_DEBUG "comedi%d: %s: detach\n", dev->minor,
PC263_DRIVER_NAME); PC263_DRIVER_NAME);
@ -387,7 +387,7 @@ static int pc263_request_region(unsigned minor, unsigned long from,
* 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 pc263_dio_insn_bits(comedi_device * dev, comedi_subdevice * s, static int pc263_dio_insn_bits(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
if (insn->n != 2) if (insn->n != 2)
@ -412,7 +412,7 @@ static int pc263_dio_insn_bits(comedi_device * dev, comedi_subdevice * s,
return 2; return 2;
} }
static int pc263_dio_insn_config(comedi_device * dev, comedi_subdevice * s, static int pc263_dio_insn_config(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
if (insn->n != 1) if (insn->n != 1)

36
drivers/staging/comedi/drivers/amplc_pci224.c
View File

@ -397,7 +397,7 @@ MODULE_DEVICE_TABLE(pci, pci224_pci_table);
/* this structure is for data unique to this hardware driver. If /* this structure is for data unique to this hardware driver. If
several hardware drivers keep similar information in this structure, several hardware drivers keep similar information in this structure,
feel free to suggest moving the variable to the comedi_device struct. */ feel free to suggest moving the variable to the struct comedi_device struct. */
typedef struct { typedef struct {
struct pci_dev *pci_dev; /* PCI device */ struct pci_dev *pci_dev; /* PCI device */
const unsigned short *hwrange; const unsigned short *hwrange;
@ -426,8 +426,8 @@ typedef struct {
* the board, and also about the kernel module that contains * the board, and also about the kernel module that contains
* the device code. * the device code.
*/ */
static int pci224_attach(comedi_device * dev, comedi_devconfig * it); static int pci224_attach(struct comedi_device * dev, comedi_devconfig * it);
static int pci224_detach(comedi_device * dev); static int pci224_detach(struct comedi_device * dev);
static comedi_driver driver_amplc_pci224 = { static comedi_driver driver_amplc_pci224 = {
driver_name:DRIVER_NAME, driver_name:DRIVER_NAME,
module:THIS_MODULE, module:THIS_MODULE,
@ -444,7 +444,7 @@ COMEDI_PCI_INITCLEANUP(driver_amplc_pci224, pci224_pci_table);
* Called from the 'insn_write' function to perform a single write. * Called from the 'insn_write' function to perform a single write.
*/ */
static void static void
pci224_ao_set_data(comedi_device * dev, int chan, int range, unsigned int data) pci224_ao_set_data(struct comedi_device * dev, int chan, int range, unsigned int data)
{ {
unsigned short mangled; unsigned short mangled;
@ -477,7 +477,7 @@ pci224_ao_set_data(comedi_device * dev, int chan, int range, unsigned int data)
* 'insn_write' function for AO subdevice. * 'insn_write' function for AO subdevice.
*/ */
static int static int
pci224_ao_insn_write(comedi_device * dev, comedi_subdevice * s, pci224_ao_insn_write(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
int i; int i;
@ -504,7 +504,7 @@ pci224_ao_insn_write(comedi_device * dev, comedi_subdevice * s,
* command. * command.
*/ */
static int static int
pci224_ao_insn_read(comedi_device * dev, comedi_subdevice * s, pci224_ao_insn_read(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
int i; int i;
@ -532,7 +532,7 @@ pci224_cascade_ns_to_timer(int osc_base, unsigned int *d1, unsigned int *d2,
/* /*
* Kills a command running on the AO subdevice. * Kills a command running on the AO subdevice.
*/ */
static void pci224_ao_stop(comedi_device * dev, comedi_subdevice * s) static void pci224_ao_stop(struct comedi_device * dev, comedi_subdevice * s)
{ {
unsigned long flags; unsigned long flags;
@ -572,7 +572,7 @@ static void pci224_ao_stop(comedi_device * dev, comedi_subdevice * s)
/* /*
* Handles start of acquisition for the AO subdevice. * Handles start of acquisition for the AO subdevice.
*/ */
static void pci224_ao_start(comedi_device * dev, comedi_subdevice * s) static void pci224_ao_start(struct comedi_device * dev, comedi_subdevice * s)
{ {
comedi_cmd *cmd = &s->async->cmd; comedi_cmd *cmd = &s->async->cmd;
unsigned long flags; unsigned long flags;
@ -599,7 +599,7 @@ static void pci224_ao_start(comedi_device * dev, comedi_subdevice * s)
/* /*
* Handles interrupts from the DAC FIFO. * Handles interrupts from the DAC FIFO.
*/ */
static void pci224_ao_handle_fifo(comedi_device * dev, comedi_subdevice * s) static void pci224_ao_handle_fifo(struct comedi_device * dev, comedi_subdevice * s)
{ {
comedi_cmd *cmd = &s->async->cmd; comedi_cmd *cmd = &s->async->cmd;
unsigned int num_scans; unsigned int num_scans;
@ -728,7 +728,7 @@ static void pci224_ao_handle_fifo(comedi_device * dev, comedi_subdevice * s)
* Internal trigger function to start acquisition on AO subdevice. * Internal trigger function to start acquisition on AO subdevice.
*/ */
static int static int
pci224_ao_inttrig_start(comedi_device * dev, comedi_subdevice * s, pci224_ao_inttrig_start(struct comedi_device * dev, comedi_subdevice * s,
unsigned int trignum) unsigned int trignum)
{ {
if (trignum != 0) if (trignum != 0)
@ -748,7 +748,7 @@ pci224_ao_inttrig_start(comedi_device * dev, comedi_subdevice * s,
* 'do_cmdtest' function for AO subdevice. * 'do_cmdtest' function for AO subdevice.
*/ */
static int static int
pci224_ao_cmdtest(comedi_device * dev, comedi_subdevice * s, comedi_cmd * cmd) pci224_ao_cmdtest(struct comedi_device * dev, comedi_subdevice * s, comedi_cmd * cmd)
{ {
int err = 0; int err = 0;
unsigned int tmp; unsigned int tmp;
@ -1015,7 +1015,7 @@ pci224_ao_cmdtest(comedi_device * dev, comedi_subdevice * s, comedi_cmd * cmd)
/* /*
* 'do_cmd' function for AO subdevice. * 'do_cmd' function for AO subdevice.
*/ */
static int pci224_ao_cmd(comedi_device * dev, comedi_subdevice * s) static int pci224_ao_cmd(struct comedi_device * dev, comedi_subdevice * s)
{ {
comedi_cmd *cmd = &s->async->cmd; comedi_cmd *cmd = &s->async->cmd;
int range; int range;
@ -1172,7 +1172,7 @@ static int pci224_ao_cmd(comedi_device * dev, comedi_subdevice * s)
/* /*
* 'cancel' function for AO subdevice. * 'cancel' function for AO subdevice.
*/ */
static int pci224_ao_cancel(comedi_device * dev, comedi_subdevice * s) static int pci224_ao_cancel(struct comedi_device * dev, comedi_subdevice * s)
{ {
pci224_ao_stop(dev, s); pci224_ao_stop(dev, s);
return 0; return 0;
@ -1182,7 +1182,7 @@ static int pci224_ao_cancel(comedi_device * dev, comedi_subdevice * s)
* 'munge' data for AO command. * 'munge' data for AO command.
*/ */
static void static void
pci224_ao_munge(comedi_device * dev, comedi_subdevice * s, void *data, pci224_ao_munge(struct comedi_device * dev, comedi_subdevice * s, void *data,
unsigned int num_bytes, unsigned int chan_index) unsigned int num_bytes, unsigned int chan_index)
{ {
comedi_async *async = s->async; comedi_async *async = s->async;
@ -1214,7 +1214,7 @@ pci224_ao_munge(comedi_device * dev, comedi_subdevice * s, void *data,
*/ */
static irqreturn_t pci224_interrupt(int irq, void *d PT_REGS_ARG) static irqreturn_t pci224_interrupt(int irq, void *d PT_REGS_ARG)
{ {
comedi_device *dev = d; struct comedi_device *dev = d;
comedi_subdevice *s = &dev->subdevices[0]; comedi_subdevice *s = &dev->subdevices[0];
comedi_cmd *cmd; comedi_cmd *cmd;
unsigned char intstat, valid_intstat; unsigned char intstat, valid_intstat;
@ -1264,7 +1264,7 @@ static irqreturn_t pci224_interrupt(int irq, void *d PT_REGS_ARG)
* bus and slot. * bus and slot.
*/ */
static int static int
pci224_find_pci(comedi_device * dev, int bus, int slot, pci224_find_pci(struct comedi_device * dev, int bus, int slot,
struct pci_dev **pci_dev_p) struct pci_dev **pci_dev_p)
{ {
struct pci_dev *pci_dev = NULL; struct pci_dev *pci_dev = NULL;
@ -1323,7 +1323,7 @@ pci224_find_pci(comedi_device * dev, int bus, int slot,
* in the driver structure, dev->board_ptr contains that * in the driver structure, dev->board_ptr contains that
* address. * address.
*/ */
static int pci224_attach(comedi_device * dev, comedi_devconfig * it) static int pci224_attach(struct comedi_device * dev, comedi_devconfig * it)
{ {
comedi_subdevice *s; comedi_subdevice *s;
struct pci_dev *pci_dev; struct pci_dev *pci_dev;
@ -1503,7 +1503,7 @@ static int pci224_attach(comedi_device * dev, comedi_devconfig * it)
* allocated by _attach(). dev->private and dev->subdevices are * allocated by _attach(). dev->private and dev->subdevices are
* deallocated automatically by the core. * deallocated automatically by the core.
*/ */
static int pci224_detach(comedi_device * dev) static int pci224_detach(struct comedi_device * dev)
{ {
printk(KERN_DEBUG "comedi%d: %s: detach\n", dev->minor, DRIVER_NAME); printk(KERN_DEBUG "comedi%d: %s: detach\n", dev->minor, DRIVER_NAME);

110
drivers/staging/comedi/drivers/amplc_pci230.c
View File

@ -515,7 +515,7 @@ MODULE_DEVICE_TABLE(pci, pci230_pci_table);
/* this structure is for data unique to this hardware driver. If /* this structure is for data unique to this hardware driver. If
several hardware drivers keep similar information in this structure, several hardware drivers keep similar information in this structure,
feel free to suggest moving the variable to the comedi_device struct. */ feel free to suggest moving the variable to the struct comedi_device struct. */
struct pci230_private { struct pci230_private {
struct pci_dev *pci_dev; struct pci_dev *pci_dev;
spinlock_t isr_spinlock; /* Interrupt spin lock */ spinlock_t isr_spinlock; /* Interrupt spin lock */
@ -601,8 +601,8 @@ static const unsigned char pci230_ao_bipolar[2] = { 0, 1 };
* the board, and also about the kernel module that contains * the board, and also about the kernel module that contains
* the device code. * the device code.
*/ */
static int pci230_attach(comedi_device * dev, comedi_devconfig * it); static int pci230_attach(struct comedi_device * dev, comedi_devconfig * it);
static int pci230_detach(comedi_device * dev); static int pci230_detach(struct comedi_device * dev);
static comedi_driver driver_amplc_pci230 = { static comedi_driver driver_amplc_pci230 = {
driver_name:"amplc_pci230", driver_name:"amplc_pci230",
module:THIS_MODULE, module:THIS_MODULE,
@ -615,32 +615,32 @@ static comedi_driver driver_amplc_pci230 = {
COMEDI_PCI_INITCLEANUP(driver_amplc_pci230, pci230_pci_table); COMEDI_PCI_INITCLEANUP(driver_amplc_pci230, pci230_pci_table);
static int pci230_ai_rinsn(comedi_device * dev, comedi_subdevice * s, static int pci230_ai_rinsn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int pci230_ao_winsn(comedi_device * dev, comedi_subdevice * s, static int pci230_ao_winsn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int pci230_ao_rinsn(comedi_device * dev, comedi_subdevice * s, static int pci230_ao_rinsn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static void pci230_ct_setup_ns_mode(comedi_device * dev, unsigned int ct, static void pci230_ct_setup_ns_mode(struct comedi_device * dev, unsigned int ct,
unsigned int mode, uint64_t ns, unsigned int round); unsigned int mode, uint64_t ns, unsigned int round);
static void pci230_ns_to_single_timer(unsigned int *ns, unsigned int round); static void pci230_ns_to_single_timer(unsigned int *ns, unsigned int round);
static void pci230_cancel_ct(comedi_device * dev, unsigned int ct); static void pci230_cancel_ct(struct comedi_device * dev, unsigned int ct);
static irqreturn_t pci230_interrupt(int irq, void *d PT_REGS_ARG); static irqreturn_t pci230_interrupt(int irq, void *d PT_REGS_ARG);
static int pci230_ao_cmdtest(comedi_device * dev, comedi_subdevice * s, static int pci230_ao_cmdtest(struct comedi_device * dev, comedi_subdevice * s,
comedi_cmd * cmd); comedi_cmd * cmd);
static int pci230_ao_cmd(comedi_device * dev, comedi_subdevice * s); static int pci230_ao_cmd(struct comedi_device * dev, comedi_subdevice * s);
static int pci230_ao_cancel(comedi_device * dev, comedi_subdevice * s); static int pci230_ao_cancel(struct comedi_device * dev, comedi_subdevice * s);
static void pci230_ao_stop(comedi_device * dev, comedi_subdevice * s); static void pci230_ao_stop(struct comedi_device * dev, comedi_subdevice * s);
static void pci230_handle_ao_nofifo(comedi_device * dev, comedi_subdevice * s); static void pci230_handle_ao_nofifo(struct comedi_device * dev, comedi_subdevice * s);
static int pci230_handle_ao_fifo(comedi_device * dev, comedi_subdevice * s); static int pci230_handle_ao_fifo(struct comedi_device * dev, comedi_subdevice * s);
static int pci230_ai_cmdtest(comedi_device * dev, comedi_subdevice * s, static int pci230_ai_cmdtest(struct comedi_device * dev, comedi_subdevice * s,
comedi_cmd * cmd); comedi_cmd * cmd);
static int pci230_ai_cmd(comedi_device * dev, comedi_subdevice * s); static int pci230_ai_cmd(struct comedi_device * dev, comedi_subdevice * s);
static int pci230_ai_cancel(comedi_device * dev, comedi_subdevice * s); static int pci230_ai_cancel(struct comedi_device * dev, comedi_subdevice * s);
static void pci230_ai_stop(comedi_device * dev, comedi_subdevice * s); static void pci230_ai_stop(struct comedi_device * dev, comedi_subdevice * s);
static void pci230_handle_ai(comedi_device * dev, comedi_subdevice * s); static void pci230_handle_ai(struct comedi_device * dev, comedi_subdevice * s);
static short pci230_ai_read(comedi_device * dev) static short pci230_ai_read(struct comedi_device * dev)
{ {
/* Read sample. */ /* Read sample. */
short data = (short) inw(dev->iobase + PCI230_ADCDATA); short data = (short) inw(dev->iobase + PCI230_ADCDATA);
@ -658,7 +658,7 @@ static short pci230_ai_read(comedi_device * dev)
return data; return data;
} }
static inline unsigned short pci230_ao_mangle_datum(comedi_device * dev, static inline unsigned short pci230_ao_mangle_datum(struct comedi_device * dev,
short datum) short datum)
{ {
/* If a bipolar range was specified, mangle it (straight binary->twos /* If a bipolar range was specified, mangle it (straight binary->twos
@ -674,7 +674,7 @@ static inline unsigned short pci230_ao_mangle_datum(comedi_device * dev,
return (unsigned short)datum; return (unsigned short)datum;
} }
static inline void pci230_ao_write_nofifo(comedi_device * dev, short datum, static inline void pci230_ao_write_nofifo(struct comedi_device * dev, short datum,
unsigned int chan) unsigned int chan)
{ {
/* Store unmangled datum to be read back later. */ /* Store unmangled datum to be read back later. */
@ -685,7 +685,7 @@ static inline void pci230_ao_write_nofifo(comedi_device * dev, short datum,
? PCI230_DACOUT1 : PCI230_DACOUT2)); ? PCI230_DACOUT1 : PCI230_DACOUT2));
} }
static inline void pci230_ao_write_fifo(comedi_device * dev, short datum, static inline void pci230_ao_write_fifo(struct comedi_device * dev, short datum,
unsigned int chan) unsigned int chan)
{ {
/* Store unmangled datum to be read back later. */ /* Store unmangled datum to be read back later. */
@ -702,7 +702,7 @@ static inline void pci230_ao_write_fifo(comedi_device * dev, short datum,
* in the driver structure, dev->board_ptr contains that * in the driver structure, dev->board_ptr contains that
* address. * address.
*/ */
static int pci230_attach(comedi_device * dev, comedi_devconfig * it) static int pci230_attach(struct comedi_device * dev, comedi_devconfig * it)
{ {
comedi_subdevice *s; comedi_subdevice *s;
unsigned long iobase1, iobase2; unsigned long iobase1, iobase2;
@ -959,7 +959,7 @@ static int pci230_attach(comedi_device * dev, comedi_devconfig * it)
* allocated by _attach(). dev->private and dev->subdevices are * allocated by _attach(). dev->private and dev->subdevices are
* deallocated automatically by the core. * deallocated automatically by the core.
*/ */
static int pci230_detach(comedi_device * dev) static int pci230_detach(struct comedi_device * dev)
{ {
printk("comedi%d: amplc_pci230: remove\n", dev->minor); printk("comedi%d: amplc_pci230: remove\n", dev->minor);
@ -982,7 +982,7 @@ static int pci230_detach(comedi_device * dev)
return 0; return 0;
} }
static int get_resources(comedi_device * dev, unsigned int res_mask, static int get_resources(struct comedi_device * dev, unsigned int res_mask,
unsigned char owner) unsigned char owner)
{ {
int ok; int ok;
@ -1018,13 +1018,13 @@ static int get_resources(comedi_device * dev, unsigned int res_mask,
return ok; return ok;
} }
static inline int get_one_resource(comedi_device * dev, unsigned int resource, static inline int get_one_resource(struct comedi_device * dev, unsigned int resource,
unsigned char owner) unsigned char owner)
{ {
return get_resources(dev, (1U << resource), owner); return get_resources(dev, (1U << resource), owner);
} }
static void put_resources(comedi_device * dev, unsigned int res_mask, static void put_resources(struct comedi_device * dev, unsigned int res_mask,
unsigned char owner) unsigned char owner)
{ {
unsigned int i; unsigned int i;
@ -1044,13 +1044,13 @@ static void put_resources(comedi_device * dev, unsigned int res_mask,
comedi_spin_unlock_irqrestore(&devpriv->res_spinlock, irqflags); comedi_spin_unlock_irqrestore(&devpriv->res_spinlock, irqflags);
} }
static inline void put_one_resource(comedi_device * dev, unsigned int resource, static inline void put_one_resource(struct comedi_device * dev, unsigned int resource,
unsigned char owner) unsigned char owner)
{ {
put_resources(dev, (1U << resource), owner); put_resources(dev, (1U << resource), owner);
} }
static inline void put_all_resources(comedi_device * dev, unsigned char owner) static inline void put_all_resources(struct comedi_device * dev, unsigned char owner)
{ {
put_resources(dev, (1U << NUM_RESOURCES) - 1, owner); put_resources(dev, (1U << NUM_RESOURCES) - 1, owner);
} }
@ -1058,7 +1058,7 @@ static inline void put_all_resources(comedi_device * dev, unsigned char owner)
/* /*
* COMEDI_SUBD_AI instruction; * COMEDI_SUBD_AI instruction;
*/ */
static int pci230_ai_rinsn(comedi_device * dev, comedi_subdevice * s, static int pci230_ai_rinsn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
unsigned int n, i; unsigned int n, i;
@ -1163,7 +1163,7 @@ static int pci230_ai_rinsn(comedi_device * dev, comedi_subdevice * s,
/* /*
* COMEDI_SUBD_AO instructions; * COMEDI_SUBD_AO instructions;
*/ */
static int pci230_ao_winsn(comedi_device * dev, comedi_subdevice * s, static int pci230_ao_winsn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
int i; int i;
@ -1191,7 +1191,7 @@ static int pci230_ao_winsn(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 pci230_ao_rinsn(comedi_device * dev, comedi_subdevice * s, static int pci230_ao_rinsn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
int i; int i;
@ -1203,7 +1203,7 @@ static int pci230_ao_rinsn(comedi_device * dev, comedi_subdevice * s,
return i; return i;
} }
static int pci230_ao_cmdtest(comedi_device * dev, comedi_subdevice * s, static int pci230_ao_cmdtest(struct comedi_device * dev, comedi_subdevice * s,
comedi_cmd * cmd) comedi_cmd * cmd)
{ {
int err = 0; int err = 0;
@ -1416,7 +1416,7 @@ static int pci230_ao_cmdtest(comedi_device * dev, comedi_subdevice * s,
return 0; return 0;
} }
static int pci230_ao_inttrig_scan_begin(comedi_device * dev, static int pci230_ao_inttrig_scan_begin(struct comedi_device * dev,
comedi_subdevice * s, unsigned int trig_num) comedi_subdevice * s, unsigned int trig_num)
{ {
unsigned long irqflags; unsigned long irqflags;
@ -1448,7 +1448,7 @@ static int pci230_ao_inttrig_scan_begin(comedi_device * dev,
return 1; return 1;
} }
static void pci230_ao_start(comedi_device * dev, comedi_subdevice * s) static void pci230_ao_start(struct comedi_device * dev, comedi_subdevice * s)
{ {
comedi_async *async = s->async; comedi_async *async = s->async;
comedi_cmd *cmd = &async->cmd; comedi_cmd *cmd = &async->cmd;
@ -1536,7 +1536,7 @@ static void pci230_ao_start(comedi_device * dev, comedi_subdevice * s)
} }
} }
static int pci230_ao_inttrig_start(comedi_device * dev, comedi_subdevice * s, static int pci230_ao_inttrig_start(struct comedi_device * dev, comedi_subdevice * s,
unsigned int trig_num) unsigned int trig_num)
{ {
if (trig_num != 0) if (trig_num != 0)
@ -1548,7 +1548,7 @@ static int pci230_ao_inttrig_start(comedi_device * dev, comedi_subdevice * s,
return 1; return 1;
} }
static int pci230_ao_cmd(comedi_device * dev, comedi_subdevice * s) static int pci230_ao_cmd(struct comedi_device * dev, comedi_subdevice * s)
{ {
unsigned short daccon; unsigned short daccon;
unsigned int range; unsigned int range;
@ -1648,7 +1648,7 @@ static int pci230_ai_check_scan_period(comedi_cmd * cmd)
return !err; return !err;
} }
static int pci230_ai_cmdtest(comedi_device * dev, comedi_subdevice * s, static int pci230_ai_cmdtest(struct comedi_device * dev, comedi_subdevice * s,
comedi_cmd * cmd) comedi_cmd * cmd)
{ {
int err = 0; int err = 0;
@ -2034,7 +2034,7 @@ static int pci230_ai_cmdtest(comedi_device * dev, comedi_subdevice * s,
return 0; return 0;
} }
static void pci230_ai_update_fifo_trigger_level(comedi_device * dev, static void pci230_ai_update_fifo_trigger_level(struct comedi_device * dev,
comedi_subdevice * s) comedi_subdevice * s)
{ {
comedi_cmd *cmd = &s->async->cmd; comedi_cmd *cmd = &s->async->cmd;
@ -2078,7 +2078,7 @@ static void pci230_ai_update_fifo_trigger_level(comedi_device * dev,
} }
} }
static int pci230_ai_inttrig_convert(comedi_device * dev, comedi_subdevice * s, static int pci230_ai_inttrig_convert(struct comedi_device * dev, comedi_subdevice * s,
unsigned int trig_num) unsigned int trig_num)
{ {
unsigned long irqflags; unsigned long irqflags;
@ -2121,7 +2121,7 @@ static int pci230_ai_inttrig_convert(comedi_device * dev, comedi_subdevice * s,
return 1; return 1;
} }
static int pci230_ai_inttrig_scan_begin(comedi_device * dev, static int pci230_ai_inttrig_scan_begin(struct comedi_device * dev,
comedi_subdevice * s, unsigned int trig_num) comedi_subdevice * s, unsigned int trig_num)
{ {
unsigned long irqflags; unsigned long irqflags;
@ -2143,7 +2143,7 @@ static int pci230_ai_inttrig_scan_begin(comedi_device * dev,
return 1; return 1;
} }
static void pci230_ai_start(comedi_device * dev, comedi_subdevice * s) static void pci230_ai_start(struct comedi_device * dev, comedi_subdevice * s)
{ {
unsigned long irqflags; unsigned long irqflags;
unsigned short conv; unsigned short conv;
@ -2280,7 +2280,7 @@ static void pci230_ai_start(comedi_device * dev, comedi_subdevice * s)
} }
} }
static int pci230_ai_inttrig_start(comedi_device * dev, comedi_subdevice * s, static int pci230_ai_inttrig_start(struct comedi_device * dev, comedi_subdevice * s,
unsigned int trig_num) unsigned int trig_num)
{ {
if (trig_num != 0) if (trig_num != 0)
@ -2292,7 +2292,7 @@ static int pci230_ai_inttrig_start(comedi_device * dev, comedi_subdevice * s,
return 1; return 1;
} }
static int pci230_ai_cmd(comedi_device * dev, comedi_subdevice * s) static int pci230_ai_cmd(struct comedi_device * dev, comedi_subdevice * s)
{ {
unsigned int i, chan, range, diff; unsigned int i, chan, range, diff;
unsigned int res_mask; unsigned int res_mask;
@ -2532,7 +2532,7 @@ static void pci230_ns_to_single_timer(unsigned int *ns, unsigned int round)
return; return;
} }
static void pci230_ct_setup_ns_mode(comedi_device * dev, unsigned int ct, static void pci230_ct_setup_ns_mode(struct comedi_device * dev, unsigned int ct,
unsigned int mode, uint64_t ns, unsigned int round) unsigned int mode, uint64_t ns, unsigned int round)
{ {
unsigned int clk_src; unsigned int clk_src;
@ -2551,7 +2551,7 @@ static void pci230_ct_setup_ns_mode(comedi_device * dev, unsigned int ct,
i8254_write(devpriv->iobase1 + PCI230_Z2_CT_BASE, 0, ct, count); i8254_write(devpriv->iobase1 + PCI230_Z2_CT_BASE, 0, ct, count);
} }
static void pci230_cancel_ct(comedi_device * dev, unsigned int ct) static void pci230_cancel_ct(struct comedi_device * dev, unsigned int ct)
{ {
i8254_set_mode(devpriv->iobase1 + PCI230_Z2_CT_BASE, 0, ct, i8254_set_mode(devpriv->iobase1 + PCI230_Z2_CT_BASE, 0, ct,
I8254_MODE1); I8254_MODE1);
@ -2562,7 +2562,7 @@ static void pci230_cancel_ct(comedi_device * dev, unsigned int ct)
static irqreturn_t pci230_interrupt(int irq, void *d PT_REGS_ARG) static irqreturn_t pci230_interrupt(int irq, void *d PT_REGS_ARG)
{ {
unsigned char status_int, valid_status_int; unsigned char status_int, valid_status_int;
comedi_device *dev = (comedi_device *) d; struct comedi_device *dev = (struct comedi_device *) d;
comedi_subdevice *s; comedi_subdevice *s;
unsigned long irqflags; unsigned long irqflags;
@ -2622,7 +2622,7 @@ static irqreturn_t pci230_interrupt(int irq, void *d PT_REGS_ARG)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static void pci230_handle_ao_nofifo(comedi_device * dev, comedi_subdevice * s) static void pci230_handle_ao_nofifo(struct comedi_device * dev, comedi_subdevice * s)
{ {
short data; short data;
int i, ret; int i, ret;
@ -2659,7 +2659,7 @@ static void pci230_handle_ao_nofifo(comedi_device * dev, comedi_subdevice * s)
/* Loads DAC FIFO (if using it) from buffer. */ /* Loads DAC FIFO (if using it) from buffer. */
/* Returns 0 if AO finished due to completion or error, 1 if still going. */ /* Returns 0 if AO finished due to completion or error, 1 if still going. */
static int pci230_handle_ao_fifo(comedi_device * dev, comedi_subdevice * s) static int pci230_handle_ao_fifo(struct comedi_device * dev, comedi_subdevice * s)
{ {
comedi_async *async = s->async; comedi_async *async = s->async;
comedi_cmd *cmd = &async->cmd; comedi_cmd *cmd = &async->cmd;
@ -2762,7 +2762,7 @@ static int pci230_handle_ao_fifo(comedi_device * dev, comedi_subdevice * s)
return running; return running;
} }
static void pci230_handle_ai(comedi_device * dev, comedi_subdevice * s) static void pci230_handle_ai(struct comedi_device * dev, comedi_subdevice * s)
{ {
unsigned int events = 0; unsigned int events = 0;
unsigned int status_fifo; unsigned int status_fifo;
@ -2861,7 +2861,7 @@ static void pci230_handle_ai(comedi_device * dev, comedi_subdevice * s)
} }
} }
static void pci230_ao_stop(comedi_device * dev, comedi_subdevice * s) static void pci230_ao_stop(struct comedi_device * dev, comedi_subdevice * s)
{ {
unsigned long irqflags; unsigned long irqflags;
unsigned char intsrc; unsigned char intsrc;
@ -2916,13 +2916,13 @@ static void pci230_ao_stop(comedi_device * dev, comedi_subdevice * s)
put_all_resources(dev, OWNER_AOCMD); put_all_resources(dev, OWNER_AOCMD);
} }
static int pci230_ao_cancel(comedi_device * dev, comedi_subdevice * s) static int pci230_ao_cancel(struct comedi_device * dev, comedi_subdevice * s)
{ {
pci230_ao_stop(dev, s); pci230_ao_stop(dev, s);
return 0; return 0;
} }
static void pci230_ai_stop(comedi_device * dev, comedi_subdevice * s) static void pci230_ai_stop(struct comedi_device * dev, comedi_subdevice * s)
{ {
unsigned long irqflags; unsigned long irqflags;
comedi_cmd *cmd; comedi_cmd *cmd;
@ -2970,7 +2970,7 @@ static void pci230_ai_stop(comedi_device * dev, comedi_subdevice * s)
put_all_resources(dev, OWNER_AICMD); put_all_resources(dev, OWNER_AICMD);
} }
static int pci230_ai_cancel(comedi_device * dev, comedi_subdevice * s) static int pci230_ai_cancel(struct comedi_device * dev, comedi_subdevice * s)
{ {
pci230_ai_stop(dev, s); pci230_ai_stop(dev, s);
return 0; return 0;

22
drivers/staging/comedi/drivers/c6xdigio.c
View File

@ -97,8 +97,8 @@ union encvaluetype {
#define C6XDIGIO_TIME_OUT 20 #define C6XDIGIO_TIME_OUT 20
static int c6xdigio_attach(comedi_device * dev, comedi_devconfig * it); static int c6xdigio_attach(struct comedi_device * dev, comedi_devconfig * it);
static int c6xdigio_detach(comedi_device * dev); static int c6xdigio_detach(struct comedi_device * dev);
comedi_driver driver_c6xdigio = { comedi_driver driver_c6xdigio = {
driver_name:"c6xdigio", driver_name:"c6xdigio",
module:THIS_MODULE, module:THIS_MODULE,
@ -338,14 +338,14 @@ static void C6X_encResetAll(unsigned long baseAddr)
} }
} }
static int c6xdigio_pwmo_insn_read(comedi_device * dev, static int c6xdigio_pwmo_insn_read(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
printk("c6xdigio_pwmo_insn_read %x\n", insn->n); printk("c6xdigio_pwmo_insn_read %x\n", insn->n);
return insn->n; return insn->n;
} }
static int c6xdigio_pwmo_insn_write(comedi_device * dev, static int c6xdigio_pwmo_insn_write(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
int i; int i;
@ -359,7 +359,7 @@ static int c6xdigio_pwmo_insn_write(comedi_device * dev,
return i; return i;
} }
//static int c6xdigio_ei_init_insn_read(comedi_device *dev, //static int c6xdigio_ei_init_insn_read(struct comedi_device *dev,
// comedi_subdevice *s, // comedi_subdevice *s,
// comedi_insn *insn, // comedi_insn *insn,
// unsigned int *data) // unsigned int *data)
@ -368,7 +368,7 @@ static int c6xdigio_pwmo_insn_write(comedi_device * dev,
// return insn->n; // return insn->n;
//} //}
//static int c6xdigio_ei_init_insn_write(comedi_device *dev, //static int c6xdigio_ei_init_insn_write(struct comedi_device *dev,
// comedi_subdevice *s, // comedi_subdevice *s,
// comedi_insn *insn, // comedi_insn *insn,
// unsigned int *data) // unsigned int *data)
@ -381,7 +381,7 @@ static int c6xdigio_pwmo_insn_write(comedi_device * dev,
// return insn->n; // return insn->n;
//} //}
static int c6xdigio_ei_insn_read(comedi_device * dev, static int c6xdigio_ei_insn_read(struct comedi_device * dev,
comedi_subdevice * s, comedi_insn * insn, unsigned int * data) comedi_subdevice * s, comedi_insn * insn, unsigned int * data)
{ {
// printk("c6xdigio_ei__insn_read %x\n", insn->n); // printk("c6xdigio_ei__insn_read %x\n", insn->n);
@ -395,7 +395,7 @@ static int c6xdigio_ei_insn_read(comedi_device * dev,
return n; return n;
} }
static void board_init(comedi_device * dev) static void board_init(struct comedi_device * dev)
{ {
//printk("Inside board_init\n"); //printk("Inside board_init\n");
@ -405,7 +405,7 @@ static void board_init(comedi_device * dev)
} }
//static void board_halt(comedi_device *dev) { //static void board_halt(struct comedi_device *dev) {
// C6X_pwmInit(dev->iobase); // C6X_pwmInit(dev->iobase);
//} //}
@ -428,7 +428,7 @@ static struct pnp_driver c6xdigio_pnp_driver = {
.id_table = c6xdigio_pnp_tbl, .id_table = c6xdigio_pnp_tbl,
}; };
static int c6xdigio_attach(comedi_device * dev, comedi_devconfig * it) static int c6xdigio_attach(struct comedi_device * dev, comedi_devconfig * it)
{ {
int result = 0; int result = 0;
unsigned long iobase; unsigned long iobase;
@ -497,7 +497,7 @@ static int c6xdigio_attach(comedi_device * dev, comedi_devconfig * it)
return 0; return 0;
} }
static int c6xdigio_detach(comedi_device * dev) static int c6xdigio_detach(struct comedi_device * dev)
{ {
// board_halt(dev); // may not need this // board_halt(dev); // may not need this

50
drivers/staging/comedi/drivers/cb_das16_cs.c
View File

@ -89,8 +89,8 @@ typedef struct {
} das16cs_private; } das16cs_private;
#define devpriv ((das16cs_private *)dev->private) #define devpriv ((das16cs_private *)dev->private)
static int das16cs_attach(comedi_device * dev, comedi_devconfig * it); static int das16cs_attach(struct comedi_device * dev, comedi_devconfig * it);
static int das16cs_detach(comedi_device * dev); static int das16cs_detach(struct comedi_device * dev);
static comedi_driver driver_das16cs = { static comedi_driver driver_das16cs = {
driver_name:"cb_das16_cs", driver_name:"cb_das16_cs",
module:THIS_MODULE, module:THIS_MODULE,
@ -109,25 +109,25 @@ static const comedi_lrange das16cs_ai_range = { 4, {
}; };
static irqreturn_t das16cs_interrupt(int irq, void *d PT_REGS_ARG); static irqreturn_t das16cs_interrupt(int irq, void *d PT_REGS_ARG);
static int das16cs_ai_rinsn(comedi_device * dev, comedi_subdevice * s, static int das16cs_ai_rinsn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int das16cs_ai_cmd(comedi_device * dev, comedi_subdevice * s); static int das16cs_ai_cmd(struct comedi_device * dev, comedi_subdevice * s);
static int das16cs_ai_cmdtest(comedi_device * dev, comedi_subdevice * s, static int das16cs_ai_cmdtest(struct comedi_device * dev, comedi_subdevice * s,
comedi_cmd * cmd); comedi_cmd * cmd);
static int das16cs_ao_winsn(comedi_device * dev, comedi_subdevice * s, static int das16cs_ao_winsn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int das16cs_ao_rinsn(comedi_device * dev, comedi_subdevice * s, static int das16cs_ao_rinsn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int das16cs_dio_insn_bits(comedi_device * dev, comedi_subdevice * s, static int das16cs_dio_insn_bits(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int das16cs_dio_insn_config(comedi_device * dev, comedi_subdevice * s, static int das16cs_dio_insn_config(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int das16cs_timer_insn_read(comedi_device * dev, comedi_subdevice * s, static int das16cs_timer_insn_read(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int das16cs_timer_insn_config(comedi_device * dev, comedi_subdevice * s, static int das16cs_timer_insn_config(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int get_prodid(comedi_device * dev, struct pcmcia_device *link) static int get_prodid(struct comedi_device * dev, struct pcmcia_device *link)
{ {
tuple_t tuple; tuple_t tuple;
u_short buf[128]; u_short buf[128];
@ -146,7 +146,7 @@ static int get_prodid(comedi_device * dev, struct pcmcia_device *link)
return prodid; return prodid;
} }
static const das16cs_board *das16cs_probe(comedi_device * dev, static const das16cs_board *das16cs_probe(struct comedi_device * dev,
struct pcmcia_device *link) struct pcmcia_device *link)
{ {
int id; int id;
@ -165,7 +165,7 @@ static const das16cs_board *das16cs_probe(comedi_device * dev,
return NULL; return NULL;
} }
static int das16cs_attach(comedi_device * dev, comedi_devconfig * it) static int das16cs_attach(struct comedi_device * dev, comedi_devconfig * it)
{ {
struct pcmcia_device *link; struct pcmcia_device *link;
comedi_subdevice *s; comedi_subdevice *s;
@ -265,7 +265,7 @@ static int das16cs_attach(comedi_device * dev, comedi_devconfig * it)
return 1; return 1;
} }
static int das16cs_detach(comedi_device * dev) static int das16cs_detach(struct comedi_device * dev)
{ {
printk("comedi%d: das16cs: remove\n", dev->minor); printk("comedi%d: das16cs: remove\n", dev->minor);
@ -278,7 +278,7 @@ static int das16cs_detach(comedi_device * dev)
static irqreturn_t das16cs_interrupt(int irq, void *d PT_REGS_ARG) static irqreturn_t das16cs_interrupt(int irq, void *d PT_REGS_ARG)
{ {
//comedi_device *dev = d; //struct comedi_device *dev = d;
return IRQ_HANDLED; return IRQ_HANDLED;
} }
@ -286,7 +286,7 @@ static irqreturn_t das16cs_interrupt(int irq, void *d PT_REGS_ARG)
* "instructions" read/write data in "one-shot" or "software-triggered" * "instructions" read/write data in "one-shot" or "software-triggered"
* mode. * mode.
*/ */
static int das16cs_ai_rinsn(comedi_device * dev, comedi_subdevice * s, static int das16cs_ai_rinsn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
int i; int i;
@ -328,12 +328,12 @@ static int das16cs_ai_rinsn(comedi_device * dev, comedi_subdevice * s,
return i; return i;
} }
static int das16cs_ai_cmd(comedi_device * dev, comedi_subdevice * s) static int das16cs_ai_cmd(struct comedi_device * dev, comedi_subdevice * s)
{ {
return -EINVAL; return -EINVAL;
} }
static int das16cs_ai_cmdtest(comedi_device * dev, comedi_subdevice * s, static int das16cs_ai_cmdtest(struct comedi_device * dev, comedi_subdevice * s,
comedi_cmd * cmd) comedi_cmd * cmd)
{ {
int err = 0; int err = 0;
@ -489,7 +489,7 @@ static int das16cs_ai_cmdtest(comedi_device * dev, comedi_subdevice * s,
return 0; return 0;
} }
static int das16cs_ao_winsn(comedi_device * dev, comedi_subdevice * s, static int das16cs_ao_winsn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
int i; int i;
@ -535,7 +535,7 @@ static int das16cs_ao_winsn(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 das16cs_ao_rinsn(comedi_device * dev, comedi_subdevice * s, static int das16cs_ao_rinsn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
int i; int i;
@ -552,7 +552,7 @@ static int das16cs_ao_rinsn(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 das16cs_dio_insn_bits(comedi_device * dev, comedi_subdevice * s, static int das16cs_dio_insn_bits(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
if (insn->n != 2) if (insn->n != 2)
@ -572,7 +572,7 @@ static int das16cs_dio_insn_bits(comedi_device * dev, comedi_subdevice * s,
return 2; return 2;
} }
static int das16cs_dio_insn_config(comedi_device * dev, comedi_subdevice * s, static int das16cs_dio_insn_config(struct comedi_device * dev, 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);
@ -610,13 +610,13 @@ static int das16cs_dio_insn_config(comedi_device * dev, comedi_subdevice * s,
return insn->n; return insn->n;
} }
static int das16cs_timer_insn_read(comedi_device * dev, comedi_subdevice * s, static int das16cs_timer_insn_read(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
return -EINVAL; return -EINVAL;
} }
static int das16cs_timer_insn_config(comedi_device * dev, comedi_subdevice * s, static int das16cs_timer_insn_config(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
return -EINVAL; return -EINVAL;

126
drivers/staging/comedi/drivers/cb_pcidas.c
View File

@ -398,7 +398,7 @@ MODULE_DEVICE_TABLE(pci, cb_pcidas_pci_table);
/* this structure is for data unique to this hardware driver. If /* this structure is for data unique to this hardware driver. If
several hardware drivers keep similar information in this structure, several hardware drivers keep similar information in this structure,
feel free to suggest moving the variable to the comedi_device struct. */ feel free to suggest moving the variable to the struct comedi_device struct. */
typedef struct { typedef struct {
/* would be useful for a PCI device */ /* would be useful for a PCI device */
struct pci_dev *pci_dev; struct pci_dev *pci_dev;
@ -440,8 +440,8 @@ typedef struct {
* the board, and also about the kernel module that contains * the board, and also about the kernel module that contains
* the device code. * the device code.
*/ */
static int cb_pcidas_attach(comedi_device * dev, comedi_devconfig * it); static int cb_pcidas_attach(struct comedi_device * dev, comedi_devconfig * it);
static int cb_pcidas_detach(comedi_device * dev); static int cb_pcidas_detach(struct comedi_device * dev);
static comedi_driver driver_cb_pcidas = { static comedi_driver driver_cb_pcidas = {
driver_name:"cb_pcidas", driver_name:"cb_pcidas",
module:THIS_MODULE, module:THIS_MODULE,
@ -449,56 +449,56 @@ static comedi_driver driver_cb_pcidas = {
detach:cb_pcidas_detach, detach:cb_pcidas_detach,
}; };
static int cb_pcidas_ai_rinsn(comedi_device * dev, comedi_subdevice * s, static int cb_pcidas_ai_rinsn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int ai_config_insn(comedi_device * dev, comedi_subdevice * s, static int ai_config_insn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int cb_pcidas_ao_nofifo_winsn(comedi_device * dev, comedi_subdevice * s, static int cb_pcidas_ao_nofifo_winsn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int cb_pcidas_ao_fifo_winsn(comedi_device * dev, comedi_subdevice * s, static int cb_pcidas_ao_fifo_winsn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int cb_pcidas_ao_readback_insn(comedi_device * dev, comedi_subdevice * s, static int cb_pcidas_ao_readback_insn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int cb_pcidas_ai_cmd(comedi_device * dev, comedi_subdevice * s); static int cb_pcidas_ai_cmd(struct comedi_device * dev, comedi_subdevice * s);
static int cb_pcidas_ai_cmdtest(comedi_device * dev, comedi_subdevice * s, static int cb_pcidas_ai_cmdtest(struct comedi_device * dev, comedi_subdevice * s,
comedi_cmd * cmd); comedi_cmd * cmd);
static int cb_pcidas_ao_cmd(comedi_device * dev, comedi_subdevice * s); static int cb_pcidas_ao_cmd(struct comedi_device * dev, comedi_subdevice * s);
static int cb_pcidas_ao_inttrig(comedi_device * dev, comedi_subdevice * subdev, static int cb_pcidas_ao_inttrig(struct comedi_device * dev, comedi_subdevice * subdev,
unsigned int trig_num); unsigned int trig_num);
static int cb_pcidas_ao_cmdtest(comedi_device * dev, comedi_subdevice * s, static int cb_pcidas_ao_cmdtest(struct comedi_device * dev, comedi_subdevice * s,
comedi_cmd * cmd); comedi_cmd * cmd);
static irqreturn_t cb_pcidas_interrupt(int irq, void *d PT_REGS_ARG); static irqreturn_t cb_pcidas_interrupt(int irq, void *d PT_REGS_ARG);
static void handle_ao_interrupt(comedi_device * dev, unsigned int status); static void handle_ao_interrupt(struct comedi_device * dev, unsigned int status);
static int cb_pcidas_cancel(comedi_device * dev, comedi_subdevice * s); static int cb_pcidas_cancel(struct comedi_device * dev, comedi_subdevice * s);
static int cb_pcidas_ao_cancel(comedi_device * dev, comedi_subdevice * s); static int cb_pcidas_ao_cancel(struct comedi_device * dev, comedi_subdevice * s);
static void cb_pcidas_load_counters(comedi_device * dev, unsigned int *ns, static void cb_pcidas_load_counters(struct comedi_device * dev, unsigned int *ns,
int round_flags); int round_flags);
static int eeprom_read_insn(comedi_device * dev, comedi_subdevice * s, static int eeprom_read_insn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int caldac_read_insn(comedi_device * dev, comedi_subdevice * s, static int caldac_read_insn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int caldac_write_insn(comedi_device * dev, comedi_subdevice * s, static int caldac_write_insn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int trimpot_read_insn(comedi_device * dev, comedi_subdevice * s, static int trimpot_read_insn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int cb_pcidas_trimpot_write(comedi_device * dev, unsigned int channel, static int cb_pcidas_trimpot_write(struct comedi_device * dev, unsigned int channel,
unsigned int value); unsigned int value);
static int trimpot_write_insn(comedi_device * dev, comedi_subdevice * s, static int trimpot_write_insn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int dac08_read_insn(comedi_device * dev, comedi_subdevice * s, static int dac08_read_insn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int dac08_write(comedi_device * dev, unsigned int value); static int dac08_write(struct comedi_device * dev, unsigned int value);
static int dac08_write_insn(comedi_device * dev, comedi_subdevice * s, static int dac08_write_insn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int caldac_8800_write(comedi_device * dev, unsigned int address, static int caldac_8800_write(struct comedi_device * dev, unsigned int address,
uint8_t value); uint8_t value);
static int trimpot_7376_write(comedi_device * dev, uint8_t value); static int trimpot_7376_write(struct comedi_device * dev, uint8_t value);
static int trimpot_8402_write(comedi_device * dev, unsigned int channel, static int trimpot_8402_write(struct comedi_device * dev, unsigned int channel,
uint8_t value); uint8_t value);
static int nvram_read(comedi_device * dev, unsigned int address, static int nvram_read(struct comedi_device * dev, unsigned int address,
uint8_t * data); uint8_t * data);
static inline unsigned int cal_enable_bits(comedi_device * dev) static inline unsigned int cal_enable_bits(struct comedi_device * dev)
{ {
return CAL_EN_BIT | CAL_SRC_BITS(devpriv->calibration_source); return CAL_EN_BIT | CAL_SRC_BITS(devpriv->calibration_source);
} }
@ -507,7 +507,7 @@ static inline unsigned int cal_enable_bits(comedi_device * dev)
* Attach is called by the Comedi core to configure the driver * Attach is called by the Comedi core to configure the driver
* for a particular board. * for a particular board.
*/ */
static int cb_pcidas_attach(comedi_device * dev, comedi_devconfig * it) static int cb_pcidas_attach(struct comedi_device * dev, comedi_devconfig * it)
{ {
comedi_subdevice *s; comedi_subdevice *s;
struct pci_dev *pcidev; struct pci_dev *pcidev;
@ -718,7 +718,7 @@ static int cb_pcidas_attach(comedi_device * dev, comedi_devconfig * it)
* allocated by _attach(). dev->private and dev->subdevices are * allocated by _attach(). dev->private and dev->subdevices are
* deallocated automatically by the core. * deallocated automatically by the core.
*/ */
static int cb_pcidas_detach(comedi_device * dev) static int cb_pcidas_detach(struct comedi_device * dev)
{ {
printk("comedi%d: cb_pcidas: remove\n", dev->minor); printk("comedi%d: cb_pcidas: remove\n", dev->minor);
@ -752,7 +752,7 @@ static int cb_pcidas_detach(comedi_device * dev)
* "instructions" read/write data in "one-shot" or "software-triggered" * "instructions" read/write data in "one-shot" or "software-triggered"
* mode. * mode.
*/ */
static int cb_pcidas_ai_rinsn(comedi_device * dev, comedi_subdevice * s, static int cb_pcidas_ai_rinsn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
int n, i; int n, i;
@ -804,7 +804,7 @@ static int cb_pcidas_ai_rinsn(comedi_device * dev, comedi_subdevice * s,
return n; return n;
} }
static int ai_config_calibration_source(comedi_device * dev, unsigned int * data) static int ai_config_calibration_source(struct comedi_device * dev, unsigned int * data)
{ {
static const int num_calibration_sources = 8; static const int num_calibration_sources = 8;
unsigned int source = data[1]; unsigned int source = data[1];
@ -819,7 +819,7 @@ static int ai_config_calibration_source(comedi_device * dev, unsigned int * data
return 2; return 2;
} }
static int ai_config_insn(comedi_device * dev, comedi_subdevice * s, static int ai_config_insn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
int id = data[0]; int id = data[0];
@ -836,7 +836,7 @@ static int ai_config_insn(comedi_device * dev, comedi_subdevice * s,
} }
// analog output insn for pcidas-1000 and 1200 series // analog output insn for pcidas-1000 and 1200 series
static int cb_pcidas_ao_nofifo_winsn(comedi_device * dev, comedi_subdevice * s, static int cb_pcidas_ao_nofifo_winsn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
int channel; int channel;
@ -861,7 +861,7 @@ static int cb_pcidas_ao_nofifo_winsn(comedi_device * dev, comedi_subdevice * s,
} }
// analog output insn for pcidas-1602 series // analog output insn for pcidas-1602 series
static int cb_pcidas_ao_fifo_winsn(comedi_device * dev, comedi_subdevice * s, static int cb_pcidas_ao_fifo_winsn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
int channel; int channel;
@ -892,7 +892,7 @@ static int cb_pcidas_ao_fifo_winsn(comedi_device * dev, comedi_subdevice * s,
// analog output readback insn // analog output readback insn
// XXX loses track of analog output value back after an analog ouput command is executed // XXX loses track of analog output value back after an analog ouput command is executed
static int cb_pcidas_ao_readback_insn(comedi_device * dev, comedi_subdevice * s, static int cb_pcidas_ao_readback_insn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
data[0] = devpriv->ao_value[CR_CHAN(insn->chanspec)]; data[0] = devpriv->ao_value[CR_CHAN(insn->chanspec)];
@ -900,7 +900,7 @@ static int cb_pcidas_ao_readback_insn(comedi_device * dev, comedi_subdevice * s,
return 1; return 1;
} }
static int eeprom_read_insn(comedi_device * dev, comedi_subdevice * s, static int eeprom_read_insn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
uint8_t nvram_data; uint8_t nvram_data;
@ -915,7 +915,7 @@ static int eeprom_read_insn(comedi_device * dev, comedi_subdevice * s,
return 1; return 1;
} }
static int caldac_write_insn(comedi_device * dev, comedi_subdevice * s, static int caldac_write_insn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
const unsigned int channel = CR_CHAN(insn->chanspec); const unsigned int channel = CR_CHAN(insn->chanspec);
@ -923,7 +923,7 @@ static int caldac_write_insn(comedi_device * dev, comedi_subdevice * s,
return caldac_8800_write(dev, channel, data[0]); return caldac_8800_write(dev, channel, data[0]);
} }
static int caldac_read_insn(comedi_device * dev, comedi_subdevice * s, static int caldac_read_insn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
data[0] = devpriv->caldac_value[CR_CHAN(insn->chanspec)]; data[0] = devpriv->caldac_value[CR_CHAN(insn->chanspec)];
@ -932,7 +932,7 @@ static int caldac_read_insn(comedi_device * dev, comedi_subdevice * s,
} }
/* 1602/16 pregain offset */ /* 1602/16 pregain offset */
static int dac08_write(comedi_device * dev, unsigned int value) static int dac08_write(struct comedi_device * dev, unsigned int value)
{ {
if (devpriv->dac08_value == value) if (devpriv->dac08_value == value)
return 1; return 1;
@ -952,13 +952,13 @@ static int dac08_write(comedi_device * dev, unsigned int value)
return 1; return 1;
} }
static int dac08_write_insn(comedi_device * dev, comedi_subdevice * s, static int dac08_write_insn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
return dac08_write(dev, data[0]); return dac08_write(dev, data[0]);
} }
static int dac08_read_insn(comedi_device * dev, comedi_subdevice * s, static int dac08_read_insn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
data[0] = devpriv->dac08_value; data[0] = devpriv->dac08_value;
@ -966,7 +966,7 @@ static int dac08_read_insn(comedi_device * dev, comedi_subdevice * s,
return 1; return 1;
} }
static int cb_pcidas_trimpot_write(comedi_device * dev, static int cb_pcidas_trimpot_write(struct comedi_device * dev,
unsigned int channel, unsigned int value) unsigned int channel, unsigned int value)
{ {
if (devpriv->trimpot_value[channel] == value) if (devpriv->trimpot_value[channel] == value)
@ -989,7 +989,7 @@ static int cb_pcidas_trimpot_write(comedi_device * dev,
return 1; return 1;
} }
static int trimpot_write_insn(comedi_device * dev, comedi_subdevice * s, static int trimpot_write_insn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
unsigned int channel = CR_CHAN(insn->chanspec); unsigned int channel = CR_CHAN(insn->chanspec);
@ -997,7 +997,7 @@ static int trimpot_write_insn(comedi_device * dev, comedi_subdevice * s,
return cb_pcidas_trimpot_write(dev, channel, data[0]); return cb_pcidas_trimpot_write(dev, channel, data[0]);
} }
static int trimpot_read_insn(comedi_device * dev, comedi_subdevice * s, static int trimpot_read_insn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
unsigned int channel = CR_CHAN(insn->chanspec); unsigned int channel = CR_CHAN(insn->chanspec);
@ -1007,7 +1007,7 @@ static int trimpot_read_insn(comedi_device * dev, comedi_subdevice * s,
return 1; return 1;
} }
static int cb_pcidas_ai_cmdtest(comedi_device * dev, comedi_subdevice * s, static int cb_pcidas_ai_cmdtest(struct comedi_device * dev, comedi_subdevice * s,
comedi_cmd * cmd) comedi_cmd * cmd)
{ {
int err = 0; int err = 0;
@ -1162,7 +1162,7 @@ static int cb_pcidas_ai_cmdtest(comedi_device * dev, comedi_subdevice * s,
return 0; return 0;
} }
static int cb_pcidas_ai_cmd(comedi_device * dev, comedi_subdevice * s) static int cb_pcidas_ai_cmd(struct comedi_device * dev, comedi_subdevice * s)
{ {
comedi_async *async = s->async; comedi_async *async = s->async;
comedi_cmd *cmd = &async->cmd; comedi_cmd *cmd = &async->cmd;
@ -1249,7 +1249,7 @@ static int cb_pcidas_ai_cmd(comedi_device * dev, comedi_subdevice * s)
return 0; return 0;
} }
static int cb_pcidas_ao_cmdtest(comedi_device * dev, comedi_subdevice * s, static int cb_pcidas_ao_cmdtest(struct comedi_device * dev, comedi_subdevice * s,
comedi_cmd * cmd) comedi_cmd * cmd)
{ {
int err = 0; int err = 0;
@ -1362,7 +1362,7 @@ static int cb_pcidas_ao_cmdtest(comedi_device * dev, comedi_subdevice * s,
return 0; return 0;
} }
static int cb_pcidas_ao_cmd(comedi_device * dev, comedi_subdevice * s) static int cb_pcidas_ao_cmd(struct comedi_device * dev, comedi_subdevice * s)
{ {
comedi_async *async = s->async; comedi_async *async = s->async;
comedi_cmd *cmd = &async->cmd; comedi_cmd *cmd = &async->cmd;
@ -1425,7 +1425,7 @@ static int cb_pcidas_ao_cmd(comedi_device * dev, comedi_subdevice * s)
return 0; return 0;
} }
static int cb_pcidas_ao_inttrig(comedi_device * dev, comedi_subdevice * s, static int cb_pcidas_ao_inttrig(struct comedi_device * dev, comedi_subdevice * s,
unsigned int trig_num) unsigned int trig_num)
{ {
unsigned int num_bytes, num_points = thisboard->fifo_size; unsigned int num_bytes, num_points = thisboard->fifo_size;
@ -1476,7 +1476,7 @@ static int cb_pcidas_ao_inttrig(comedi_device * dev, comedi_subdevice * s,
static irqreturn_t cb_pcidas_interrupt(int irq, void *d PT_REGS_ARG) static irqreturn_t cb_pcidas_interrupt(int irq, void *d PT_REGS_ARG)
{ {
comedi_device *dev = (comedi_device *) d; struct comedi_device *dev = (struct comedi_device *) d;
comedi_subdevice *s = dev->read_subdev; comedi_subdevice *s = dev->read_subdev;
comedi_async *async; comedi_async *async;
int status, s5933_status; int status, s5933_status;
@ -1586,7 +1586,7 @@ static irqreturn_t cb_pcidas_interrupt(int irq, void *d PT_REGS_ARG)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static void handle_ao_interrupt(comedi_device * dev, unsigned int status) static void handle_ao_interrupt(struct comedi_device * dev, unsigned int status)
{ {
comedi_subdevice *s = dev->write_subdev; comedi_subdevice *s = dev->write_subdev;
comedi_async *async = s->async; comedi_async *async = s->async;
@ -1643,7 +1643,7 @@ static void handle_ao_interrupt(comedi_device * dev, unsigned int status)
} }
// cancel analog input command // cancel analog input command
static int cb_pcidas_cancel(comedi_device * dev, comedi_subdevice * s) static int cb_pcidas_cancel(struct comedi_device * dev, comedi_subdevice * s)
{ {
unsigned long flags; unsigned long flags;
@ -1662,7 +1662,7 @@ static int cb_pcidas_cancel(comedi_device * dev, comedi_subdevice * s)
} }
// cancel analog output command // cancel analog output command
static int cb_pcidas_ao_cancel(comedi_device * dev, comedi_subdevice * s) static int cb_pcidas_ao_cancel(struct comedi_device * dev, comedi_subdevice * s)
{ {
unsigned long flags; unsigned long flags;
@ -1679,7 +1679,7 @@ static int cb_pcidas_ao_cancel(comedi_device * dev, comedi_subdevice * s)
return 0; return 0;
} }
static void cb_pcidas_load_counters(comedi_device * dev, unsigned int *ns, static void cb_pcidas_load_counters(struct comedi_device * dev, unsigned int *ns,
int rounding_flags) int rounding_flags)
{ {
i8253_cascade_ns_to_timer_2div(TIMER_BASE, &(devpriv->divisor1), i8253_cascade_ns_to_timer_2div(TIMER_BASE, &(devpriv->divisor1),
@ -1692,7 +1692,7 @@ static void cb_pcidas_load_counters(comedi_device * dev, unsigned int *ns,
devpriv->divisor2, 2); devpriv->divisor2, 2);
} }
static void write_calibration_bitstream(comedi_device * dev, static void write_calibration_bitstream(struct comedi_device * dev,
unsigned int register_bits, unsigned int bitstream, unsigned int register_bits, unsigned int bitstream,
unsigned int bitstream_length) unsigned int bitstream_length)
{ {
@ -1709,7 +1709,7 @@ static void write_calibration_bitstream(comedi_device * dev,
} }
} }
static int caldac_8800_write(comedi_device * dev, unsigned int address, static int caldac_8800_write(struct comedi_device * dev, unsigned int address,
uint8_t value) uint8_t value)
{ {
static const int num_caldac_channels = 8; static const int num_caldac_channels = 8;
@ -1739,7 +1739,7 @@ static int caldac_8800_write(comedi_device * dev, unsigned int address,
return 1; return 1;
} }
static int trimpot_7376_write(comedi_device * dev, uint8_t value) static int trimpot_7376_write(struct comedi_device * dev, uint8_t value)
{ {
static const int bitstream_length = 7; static const int bitstream_length = 7;
unsigned int bitstream = value & 0x7f; unsigned int bitstream = value & 0x7f;
@ -1762,7 +1762,7 @@ static int trimpot_7376_write(comedi_device * dev, uint8_t value)
/* For 1602/16 only /* For 1602/16 only
* ch 0 : adc gain * ch 0 : adc gain
* ch 1 : adc postgain offset */ * ch 1 : adc postgain offset */
static int trimpot_8402_write(comedi_device * dev, unsigned int channel, static int trimpot_8402_write(struct comedi_device * dev, unsigned int channel,
uint8_t value) uint8_t value)
{ {
static const int bitstream_length = 10; static const int bitstream_length = 10;
@ -1798,7 +1798,7 @@ static int wait_for_nvram_ready(unsigned long s5933_base_addr)
return -1; return -1;
} }
static int nvram_read(comedi_device * dev, unsigned int address, uint8_t * data) static int nvram_read(struct comedi_device * dev, unsigned int address, uint8_t * data)
{ {
unsigned long iobase = devpriv->s5933_config; unsigned long iobase = devpriv->s5933_config;

254
drivers/staging/comedi/drivers/cb_pcidas64.c
View File

@ -1044,12 +1044,12 @@ static DEFINE_PCI_DEVICE_TABLE(pcidas64_pci_table) = {
MODULE_DEVICE_TABLE(pci, pcidas64_pci_table); MODULE_DEVICE_TABLE(pci, pcidas64_pci_table);
static inline pcidas64_board *board(const comedi_device * dev) static inline pcidas64_board *board(const struct comedi_device * dev)
{ {
return (pcidas64_board *) dev->board_ptr; return (pcidas64_board *) dev->board_ptr;
} }
static inline unsigned short se_diff_bit_6xxx(comedi_device * dev, static inline unsigned short se_diff_bit_6xxx(struct comedi_device * dev,
int use_differential) int use_differential)
{ {
if ((board(dev)->layout == LAYOUT_64XX && !use_differential) || if ((board(dev)->layout == LAYOUT_64XX && !use_differential) ||
@ -1114,7 +1114,7 @@ typedef struct {
/* inline function that makes it easier to /* inline function that makes it easier to
* access the private structure. * access the private structure.
*/ */
static inline pcidas64_private *priv(comedi_device * dev) static inline pcidas64_private *priv(struct comedi_device * dev)
{ {
return dev->private; return dev->private;
} }
@ -1125,8 +1125,8 @@ static inline pcidas64_private *priv(comedi_device * dev)
* the board, and also about the kernel module that contains * the board, and also about the kernel module that contains
* the device code. * the device code.
*/ */
static int attach(comedi_device * dev, comedi_devconfig * it); static int attach(struct comedi_device * dev, comedi_devconfig * it);
static int detach(comedi_device * dev); static int detach(struct comedi_device * dev);
static comedi_driver driver_cb_pcidas = { static comedi_driver driver_cb_pcidas = {
driver_name:"cb_pcidas64", driver_name:"cb_pcidas64",
module:THIS_MODULE, module:THIS_MODULE,
@ -1134,73 +1134,73 @@ static comedi_driver driver_cb_pcidas = {
detach:detach, detach:detach,
}; };
static int ai_rinsn(comedi_device * dev, comedi_subdevice * s, static int ai_rinsn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int ai_config_insn(comedi_device * dev, comedi_subdevice * s, static int ai_config_insn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int ao_winsn(comedi_device * dev, comedi_subdevice * s, static int ao_winsn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int ao_readback_insn(comedi_device * dev, comedi_subdevice * s, static int ao_readback_insn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int ai_cmd(comedi_device * dev, comedi_subdevice * s); static int ai_cmd(struct comedi_device * dev, comedi_subdevice * s);
static int ai_cmdtest(comedi_device * dev, comedi_subdevice * s, static int ai_cmdtest(struct comedi_device * dev, comedi_subdevice * s,
comedi_cmd * cmd); comedi_cmd * cmd);
static int ao_cmd(comedi_device * dev, comedi_subdevice * s); static int ao_cmd(struct comedi_device * dev, comedi_subdevice * s);
static int ao_inttrig(comedi_device * dev, comedi_subdevice * subdev, static int ao_inttrig(struct comedi_device * dev, comedi_subdevice * subdev,
unsigned int trig_num); unsigned int trig_num);
static int ao_cmdtest(comedi_device * dev, comedi_subdevice * s, static int ao_cmdtest(struct comedi_device * dev, comedi_subdevice * s,
comedi_cmd * cmd); comedi_cmd * cmd);
static irqreturn_t handle_interrupt(int irq, void *d PT_REGS_ARG); static irqreturn_t handle_interrupt(int irq, void *d PT_REGS_ARG);
static int ai_cancel(comedi_device * dev, comedi_subdevice * s); static int ai_cancel(struct comedi_device * dev, comedi_subdevice * s);
static int ao_cancel(comedi_device * dev, comedi_subdevice * s); static int ao_cancel(struct comedi_device * dev, comedi_subdevice * s);
static int dio_callback(int dir, int port, int data, unsigned long arg); static int dio_callback(int dir, int port, int data, unsigned long arg);
static int dio_callback_4020(int dir, int port, int data, unsigned long arg); static int dio_callback_4020(int dir, int port, int data, unsigned long arg);
static int di_rbits(comedi_device * dev, comedi_subdevice * s, static int di_rbits(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int do_wbits(comedi_device * dev, comedi_subdevice * s, static int do_wbits(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int dio_60xx_config_insn(comedi_device * dev, comedi_subdevice * s, static int dio_60xx_config_insn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int dio_60xx_wbits(comedi_device * dev, comedi_subdevice * s, static int dio_60xx_wbits(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int calib_read_insn(comedi_device * dev, comedi_subdevice * s, static int calib_read_insn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int calib_write_insn(comedi_device * dev, comedi_subdevice * s, static int calib_write_insn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int ad8402_read_insn(comedi_device * dev, comedi_subdevice * s, static int ad8402_read_insn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static void ad8402_write(comedi_device * dev, unsigned int channel, static void ad8402_write(struct comedi_device * dev, unsigned int channel,
unsigned int value); unsigned int value);
static int ad8402_write_insn(comedi_device * dev, comedi_subdevice * s, static int ad8402_write_insn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int eeprom_read_insn(comedi_device * dev, comedi_subdevice * s, static int eeprom_read_insn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static void check_adc_timing(comedi_device * dev, comedi_cmd * cmd); static void check_adc_timing(struct comedi_device * dev, comedi_cmd * cmd);
static unsigned int get_divisor(unsigned int ns, unsigned int flags); static unsigned int get_divisor(unsigned int ns, unsigned int flags);
static void i2c_write(comedi_device * dev, unsigned int address, static void i2c_write(struct comedi_device * dev, unsigned int address,
const uint8_t * data, unsigned int length); const uint8_t * data, unsigned int length);
static void caldac_write(comedi_device * dev, unsigned int channel, static void caldac_write(struct comedi_device * dev, unsigned int channel,
unsigned int value); unsigned int value);
static int caldac_8800_write(comedi_device * dev, unsigned int address, static int caldac_8800_write(struct comedi_device * dev, unsigned int address,
uint8_t value); uint8_t value);
//static int dac_1590_write(comedi_device *dev, unsigned int dac_a, unsigned int dac_b); //static int dac_1590_write(struct comedi_device *dev, unsigned int dac_a, unsigned int dac_b);
static int caldac_i2c_write(comedi_device * dev, unsigned int caldac_channel, static int caldac_i2c_write(struct comedi_device * dev, unsigned int caldac_channel,
unsigned int value); unsigned int value);
static void abort_dma(comedi_device * dev, unsigned int channel); static void abort_dma(struct comedi_device * dev, unsigned int channel);
static void disable_plx_interrupts(comedi_device * dev); static void disable_plx_interrupts(struct comedi_device * dev);
static int set_ai_fifo_size(comedi_device * dev, unsigned int num_samples); static int set_ai_fifo_size(struct comedi_device * dev, unsigned int num_samples);
static unsigned int ai_fifo_size(comedi_device * dev); static unsigned int ai_fifo_size(struct comedi_device * dev);
static int set_ai_fifo_segment_length(comedi_device * dev, static int set_ai_fifo_segment_length(struct comedi_device * dev,
unsigned int num_entries); unsigned int num_entries);
static void disable_ai_pacing(comedi_device * dev); static void disable_ai_pacing(struct comedi_device * dev);
static void disable_ai_interrupts(comedi_device * dev); static void disable_ai_interrupts(struct comedi_device * dev);
static void enable_ai_interrupts(comedi_device * dev, const comedi_cmd * cmd); static void enable_ai_interrupts(struct comedi_device * dev, const comedi_cmd * cmd);
static unsigned int get_ao_divisor(unsigned int ns, unsigned int flags); static unsigned int get_ao_divisor(unsigned int ns, unsigned int flags);
static void load_ao_dma(comedi_device * dev, const comedi_cmd * cmd); static void load_ao_dma(struct comedi_device * dev, const comedi_cmd * cmd);
COMEDI_PCI_INITCLEANUP(driver_cb_pcidas, pcidas64_pci_table); COMEDI_PCI_INITCLEANUP(driver_cb_pcidas, pcidas64_pci_table);
static unsigned int ai_range_bits_6xxx(const comedi_device * dev, static unsigned int ai_range_bits_6xxx(const struct comedi_device * dev,
unsigned int range_index) unsigned int range_index)
{ {
const comedi_krange *range = const comedi_krange *range =
@ -1244,7 +1244,7 @@ static unsigned int ai_range_bits_6xxx(const comedi_device * dev,
return bits; return bits;
} }
static unsigned int hw_revision(const comedi_device * dev, static unsigned int hw_revision(const struct comedi_device * dev,
uint16_t hw_status_bits) uint16_t hw_status_bits)
{ {
if (board(dev)->layout == LAYOUT_4020) if (board(dev)->layout == LAYOUT_4020)
@ -1253,7 +1253,7 @@ static unsigned int hw_revision(const comedi_device * dev,
return (hw_status_bits >> 12) & 0xf; return (hw_status_bits >> 12) & 0xf;
} }
static void set_dac_range_bits(comedi_device * dev, volatile uint16_t * bits, static void set_dac_range_bits(struct comedi_device * dev, volatile uint16_t * bits,
unsigned int channel, unsigned int range) unsigned int channel, unsigned int range)
{ {
unsigned int code = board(dev)->ao_range_code[range]; unsigned int code = board(dev)->ao_range_code[range];
@ -1273,7 +1273,7 @@ static inline int ao_cmd_is_supported(const pcidas64_board * board)
} }
// initialize plx9080 chip // initialize plx9080 chip
static void init_plx9080(comedi_device * dev) static void init_plx9080(struct comedi_device * dev)
{ {
uint32_t bits; uint32_t bits;
void *plx_iobase = priv(dev)->plx9080_iobase; void *plx_iobase = priv(dev)->plx9080_iobase;
@ -1363,7 +1363,7 @@ static void init_plx9080(comedi_device * dev)
/* Allocate and initialize the subdevice structures. /* Allocate and initialize the subdevice structures.
*/ */
static int setup_subdevices(comedi_device * dev) static int setup_subdevices(struct comedi_device * dev)
{ {
comedi_subdevice *s; comedi_subdevice *s;
void *dio_8255_iobase; void *dio_8255_iobase;
@ -1526,14 +1526,14 @@ static int setup_subdevices(comedi_device * dev)
return 0; return 0;
} }
static void disable_plx_interrupts(comedi_device * dev) static void disable_plx_interrupts(struct comedi_device * dev)
{ {
priv(dev)->plx_intcsr_bits = 0; priv(dev)->plx_intcsr_bits = 0;
writel(priv(dev)->plx_intcsr_bits, writel(priv(dev)->plx_intcsr_bits,
priv(dev)->plx9080_iobase + PLX_INTRCS_REG); priv(dev)->plx9080_iobase + PLX_INTRCS_REG);
} }
static void init_stc_registers(comedi_device * dev) static void init_stc_registers(struct comedi_device * dev)
{ {
uint16_t bits; uint16_t bits;
unsigned long flags; unsigned long flags;
@ -1575,7 +1575,7 @@ static void init_stc_registers(comedi_device * dev)
disable_ai_pacing(dev); disable_ai_pacing(dev);
}; };
int alloc_and_init_dma_members(comedi_device * dev) int alloc_and_init_dma_members(struct comedi_device * dev)
{ {
int i; int i;
@ -1661,7 +1661,7 @@ int alloc_and_init_dma_members(comedi_device * dev)
return 0; return 0;
} }
static inline void warn_external_queue(comedi_device * dev) static inline void warn_external_queue(struct comedi_device * dev)
{ {
comedi_error(dev, comedi_error(dev,
"AO command and AI external channel queue cannot be used simultaneously."); "AO command and AI external channel queue cannot be used simultaneously.");
@ -1673,7 +1673,7 @@ static inline void warn_external_queue(comedi_device * dev)
* Attach is called by the Comedi core to configure the driver * Attach is called by the Comedi core to configure the driver
* for a particular board. * for a particular board.
*/ */
static int attach(comedi_device * dev, comedi_devconfig * it) static int attach(struct comedi_device * dev, comedi_devconfig * it)
{ {
struct pci_dev *pcidev; struct pci_dev *pcidev;
int index; int index;
@ -1821,7 +1821,7 @@ static int attach(comedi_device * dev, comedi_devconfig * it)
* allocated by _attach(). dev->private and dev->subdevices are * allocated by _attach(). dev->private and dev->subdevices are
* deallocated automatically by the core. * deallocated automatically by the core.
*/ */
static int detach(comedi_device * dev) static int detach(struct comedi_device * dev)
{ {
unsigned int i; unsigned int i;
@ -1881,7 +1881,7 @@ static int detach(comedi_device * dev)
return 0; return 0;
} }
static int ai_rinsn(comedi_device * dev, comedi_subdevice * s, static int ai_rinsn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
unsigned int bits = 0, n, i; unsigned int bits = 0, n, i;
@ -2018,7 +2018,7 @@ static int ai_rinsn(comedi_device * dev, comedi_subdevice * s,
return n; return n;
} }
static int ai_config_calibration_source(comedi_device * dev, unsigned int * data) static int ai_config_calibration_source(struct comedi_device * dev, unsigned int * data)
{ {
unsigned int source = data[1]; unsigned int source = data[1];
int num_calibration_sources; int num_calibration_sources;
@ -2038,7 +2038,7 @@ static int ai_config_calibration_source(comedi_device * dev, unsigned int * data
return 2; return 2;
} }
static int ai_config_block_size(comedi_device * dev, unsigned int * data) static int ai_config_block_size(struct comedi_device * dev, unsigned int * data)
{ {
int fifo_size; int fifo_size;
const hw_fifo_info_t *const fifo = board(dev)->ai_fifo; const hw_fifo_info_t *const fifo = board(dev)->ai_fifo;
@ -2065,7 +2065,7 @@ static int ai_config_block_size(comedi_device * dev, unsigned int * data)
return 2; return 2;
} }
static int ai_config_master_clock_4020(comedi_device * dev, unsigned int * data) static int ai_config_master_clock_4020(struct comedi_device * dev, unsigned int * data)
{ {
unsigned int divisor = data[4]; unsigned int divisor = data[4];
int retval = 0; int retval = 0;
@ -2091,7 +2091,7 @@ static int ai_config_master_clock_4020(comedi_device * dev, unsigned int * data)
} }
// XXX could add support for 60xx series // XXX could add support for 60xx series
static int ai_config_master_clock(comedi_device * dev, unsigned int * data) static int ai_config_master_clock(struct comedi_device * dev, unsigned int * data)
{ {
switch (board(dev)->layout) { switch (board(dev)->layout) {
@ -2106,7 +2106,7 @@ static int ai_config_master_clock(comedi_device * dev, unsigned int * data)
return -EINVAL; return -EINVAL;
} }
static int ai_config_insn(comedi_device * dev, comedi_subdevice * s, static int ai_config_insn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
int id = data[0]; int id = data[0];
@ -2128,7 +2128,7 @@ static int ai_config_insn(comedi_device * dev, comedi_subdevice * s,
return -EINVAL; return -EINVAL;
} }
static int ai_cmdtest(comedi_device * dev, comedi_subdevice * s, static int ai_cmdtest(struct comedi_device * dev, comedi_subdevice * s,
comedi_cmd * cmd) comedi_cmd * cmd)
{ {
int err = 0; int err = 0;
@ -2324,7 +2324,7 @@ static int use_hw_sample_counter(comedi_cmd * cmd)
return 0; return 0;
} }
static void setup_sample_counters(comedi_device * dev, comedi_cmd * cmd) static void setup_sample_counters(struct comedi_device * dev, comedi_cmd * cmd)
{ {
if (cmd->stop_src == TRIG_COUNT) { if (cmd->stop_src == TRIG_COUNT) {
// set software count // set software count
@ -2341,7 +2341,7 @@ static void setup_sample_counters(comedi_device * dev, comedi_cmd * cmd)
} }
} }
static inline unsigned int dma_transfer_size(comedi_device * dev) static inline unsigned int dma_transfer_size(struct comedi_device * dev)
{ {
unsigned int num_samples; unsigned int num_samples;
@ -2354,7 +2354,7 @@ static inline unsigned int dma_transfer_size(comedi_device * dev)
return num_samples; return num_samples;
} }
static void disable_ai_pacing(comedi_device * dev) static void disable_ai_pacing(struct comedi_device * dev)
{ {
unsigned long flags; unsigned long flags;
@ -2371,7 +2371,7 @@ static void disable_ai_pacing(comedi_device * dev)
priv(dev)->main_iobase + ADC_CONTROL0_REG); priv(dev)->main_iobase + ADC_CONTROL0_REG);
} }
static void disable_ai_interrupts(comedi_device * dev) static void disable_ai_interrupts(struct comedi_device * dev)
{ {
unsigned long flags; unsigned long flags;
@ -2387,7 +2387,7 @@ static void disable_ai_interrupts(comedi_device * dev)
DEBUG_PRINT("intr enable bits 0x%x\n", priv(dev)->intr_enable_bits); DEBUG_PRINT("intr enable bits 0x%x\n", priv(dev)->intr_enable_bits);
} }
static void enable_ai_interrupts(comedi_device * dev, const comedi_cmd * cmd) static void enable_ai_interrupts(struct comedi_device * dev, const comedi_cmd * cmd)
{ {
uint32_t bits; uint32_t bits;
unsigned long flags; unsigned long flags;
@ -2408,14 +2408,14 @@ static void enable_ai_interrupts(comedi_device * dev, const comedi_cmd * cmd)
comedi_spin_unlock_irqrestore(&dev->spinlock, flags); comedi_spin_unlock_irqrestore(&dev->spinlock, flags);
} }
static uint32_t ai_convert_counter_6xxx(const comedi_device * dev, static uint32_t ai_convert_counter_6xxx(const struct comedi_device * dev,
const comedi_cmd * cmd) const comedi_cmd * cmd)
{ {
// supposed to load counter with desired divisor minus 3 // supposed to load counter with desired divisor minus 3
return cmd->convert_arg / TIMER_BASE - 3; return cmd->convert_arg / TIMER_BASE - 3;
} }
static uint32_t ai_scan_counter_6xxx(comedi_device * dev, comedi_cmd * cmd) static uint32_t ai_scan_counter_6xxx(struct comedi_device * dev, comedi_cmd * cmd)
{ {
uint32_t count; uint32_t count;
// figure out how long we need to delay at end of scan // figure out how long we need to delay at end of scan
@ -2435,7 +2435,7 @@ static uint32_t ai_scan_counter_6xxx(comedi_device * dev, comedi_cmd * cmd)
return count - 3; return count - 3;
} }
static uint32_t ai_convert_counter_4020(comedi_device * dev, comedi_cmd * cmd) static uint32_t ai_convert_counter_4020(struct comedi_device * dev, comedi_cmd * cmd)
{ {
unsigned int divisor; unsigned int divisor;
@ -2456,7 +2456,7 @@ static uint32_t ai_convert_counter_4020(comedi_device * dev, comedi_cmd * cmd)
return divisor - 2; return divisor - 2;
} }
static void select_master_clock_4020(comedi_device * dev, static void select_master_clock_4020(struct comedi_device * dev,
const comedi_cmd * cmd) const comedi_cmd * cmd)
{ {
// select internal/external master clock // select internal/external master clock
@ -2475,7 +2475,7 @@ static void select_master_clock_4020(comedi_device * dev,
priv(dev)->main_iobase + HW_CONFIG_REG); priv(dev)->main_iobase + HW_CONFIG_REG);
} }
static void select_master_clock(comedi_device * dev, const comedi_cmd * cmd) static void select_master_clock(struct comedi_device * dev, const comedi_cmd * cmd)
{ {
switch (board(dev)->layout) { switch (board(dev)->layout) {
case LAYOUT_4020: case LAYOUT_4020:
@ -2486,7 +2486,7 @@ static void select_master_clock(comedi_device * dev, const comedi_cmd * cmd)
} }
} }
static inline void dma_start_sync(comedi_device * dev, unsigned int channel) static inline void dma_start_sync(struct comedi_device * dev, unsigned int channel)
{ {
unsigned long flags; unsigned long flags;
@ -2503,7 +2503,7 @@ static inline void dma_start_sync(comedi_device * dev, unsigned int channel)
comedi_spin_unlock_irqrestore(&dev->spinlock, flags); comedi_spin_unlock_irqrestore(&dev->spinlock, flags);
} }
static void set_ai_pacing(comedi_device * dev, comedi_cmd * cmd) static void set_ai_pacing(struct comedi_device * dev, comedi_cmd * cmd)
{ {
uint32_t convert_counter = 0, scan_counter = 0; uint32_t convert_counter = 0, scan_counter = 0;
@ -2550,7 +2550,7 @@ static int use_internal_queue_6xxx(const comedi_cmd * cmd)
return 1; return 1;
} }
static int setup_channel_queue(comedi_device * dev, const comedi_cmd * cmd) static int setup_channel_queue(struct comedi_device * dev, const comedi_cmd * cmd)
{ {
unsigned short bits; unsigned short bits;
int i; int i;
@ -2652,7 +2652,7 @@ static int setup_channel_queue(comedi_device * dev, const comedi_cmd * cmd)
return 0; return 0;
} }
static inline void load_first_dma_descriptor(comedi_device * dev, static inline void load_first_dma_descriptor(struct comedi_device * dev,
unsigned int dma_channel, unsigned int descriptor_bits) unsigned int dma_channel, unsigned int descriptor_bits)
{ {
/* The transfer size, pci address, and local address registers /* The transfer size, pci address, and local address registers
@ -2679,7 +2679,7 @@ static inline void load_first_dma_descriptor(comedi_device * dev,
} }
} }
static int ai_cmd(comedi_device * dev, comedi_subdevice * s) static int ai_cmd(struct comedi_device * dev, comedi_subdevice * s)
{ {
comedi_async *async = s->async; comedi_async *async = s->async;
comedi_cmd *cmd = &async->cmd; comedi_cmd *cmd = &async->cmd;
@ -2797,7 +2797,7 @@ static int ai_cmd(comedi_device * dev, comedi_subdevice * s)
} }
// read num_samples from 16 bit wide ai fifo // read num_samples from 16 bit wide ai fifo
static void pio_drain_ai_fifo_16(comedi_device * dev) static void pio_drain_ai_fifo_16(struct comedi_device * dev)
{ {
comedi_subdevice *s = dev->read_subdev; comedi_subdevice *s = dev->read_subdev;
comedi_async *async = s->async; comedi_async *async = s->async;
@ -2864,7 +2864,7 @@ static void pio_drain_ai_fifo_16(comedi_device * dev)
* dma transfers (it only supports the use of pio for draining the last remaining * dma transfers (it only supports the use of pio for draining the last remaining
* points from the fifo when a data aquisition operation has completed). * points from the fifo when a data aquisition operation has completed).
*/ */
static void pio_drain_ai_fifo_32(comedi_device * dev) static void pio_drain_ai_fifo_32(struct comedi_device * dev)
{ {
comedi_subdevice *s = dev->read_subdev; comedi_subdevice *s = dev->read_subdev;
comedi_async *async = s->async; comedi_async *async = s->async;
@ -2898,7 +2898,7 @@ static void pio_drain_ai_fifo_32(comedi_device * dev)
} }
// empty fifo // empty fifo
static void pio_drain_ai_fifo(comedi_device * dev) static void pio_drain_ai_fifo(struct comedi_device * dev)
{ {
if (board(dev)->layout == LAYOUT_4020) { if (board(dev)->layout == LAYOUT_4020) {
pio_drain_ai_fifo_32(dev); pio_drain_ai_fifo_32(dev);
@ -2906,7 +2906,7 @@ static void pio_drain_ai_fifo(comedi_device * dev)
pio_drain_ai_fifo_16(dev); pio_drain_ai_fifo_16(dev);
} }
static void drain_dma_buffers(comedi_device * dev, unsigned int channel) static void drain_dma_buffers(struct comedi_device * dev, unsigned int channel)
{ {
comedi_async *async = dev->read_subdev->async; comedi_async *async = dev->read_subdev->async;
uint32_t next_transfer_addr; uint32_t next_transfer_addr;
@ -2952,7 +2952,7 @@ static void drain_dma_buffers(comedi_device * dev, unsigned int channel)
* unused buffer) */ * unused buffer) */
} }
void handle_ai_interrupt(comedi_device * dev, unsigned short status, void handle_ai_interrupt(struct comedi_device * dev, unsigned short status,
unsigned int plx_status) unsigned int plx_status)
{ {
comedi_subdevice *s = dev->read_subdev; comedi_subdevice *s = dev->read_subdev;
@ -3006,7 +3006,7 @@ void handle_ai_interrupt(comedi_device * dev, unsigned short status,
cfc_handle_events(dev, s); cfc_handle_events(dev, s);
} }
static inline unsigned int prev_ao_dma_index(comedi_device * dev) static inline unsigned int prev_ao_dma_index(struct comedi_device * dev)
{ {
unsigned int buffer_index; unsigned int buffer_index;
@ -3017,7 +3017,7 @@ static inline unsigned int prev_ao_dma_index(comedi_device * dev)
return buffer_index; return buffer_index;
} }
static int last_ao_dma_load_completed(comedi_device * dev) static int last_ao_dma_load_completed(struct comedi_device * dev)
{ {
unsigned int buffer_index; unsigned int buffer_index;
unsigned int transfer_address; unsigned int transfer_address;
@ -3036,7 +3036,7 @@ static int last_ao_dma_load_completed(comedi_device * dev)
return 1; return 1;
} }
static int ao_stopped_by_error(comedi_device * dev, const comedi_cmd * cmd) static int ao_stopped_by_error(struct comedi_device * dev, const comedi_cmd * cmd)
{ {
if (cmd->stop_src == TRIG_NONE) if (cmd->stop_src == TRIG_NONE)
return 1; return 1;
@ -3049,7 +3049,7 @@ static int ao_stopped_by_error(comedi_device * dev, const comedi_cmd * cmd)
return 0; return 0;
} }
static inline int ao_dma_needs_restart(comedi_device * dev, static inline int ao_dma_needs_restart(struct comedi_device * dev,
unsigned short dma_status) unsigned short dma_status)
{ {
if ((dma_status & PLX_DMA_DONE_BIT) == 0 || if ((dma_status & PLX_DMA_DONE_BIT) == 0 ||
@ -3061,7 +3061,7 @@ static inline int ao_dma_needs_restart(comedi_device * dev,
return 1; return 1;
} }
static void restart_ao_dma(comedi_device * dev) static void restart_ao_dma(struct comedi_device * dev)
{ {
unsigned int dma_desc_bits; unsigned int dma_desc_bits;
@ -3074,7 +3074,7 @@ static void restart_ao_dma(comedi_device * dev)
dma_start_sync(dev, 0); dma_start_sync(dev, 0);
} }
static void handle_ao_interrupt(comedi_device * dev, unsigned short status, static void handle_ao_interrupt(struct comedi_device * dev, unsigned short status,
unsigned int plx_status) unsigned int plx_status)
{ {
comedi_subdevice *s = dev->write_subdev; comedi_subdevice *s = dev->write_subdev;
@ -3128,7 +3128,7 @@ static void handle_ao_interrupt(comedi_device * dev, unsigned short status,
static irqreturn_t handle_interrupt(int irq, void *d PT_REGS_ARG) static irqreturn_t handle_interrupt(int irq, void *d PT_REGS_ARG)
{ {
comedi_device *dev = d; struct comedi_device *dev = d;
unsigned short status; unsigned short status;
uint32_t plx_status; uint32_t plx_status;
uint32_t plx_bits; uint32_t plx_bits;
@ -3162,7 +3162,7 @@ static irqreturn_t handle_interrupt(int irq, void *d PT_REGS_ARG)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
void abort_dma(comedi_device * dev, unsigned int channel) void abort_dma(struct comedi_device * dev, unsigned int channel)
{ {
unsigned long flags; unsigned long flags;
@ -3174,7 +3174,7 @@ void abort_dma(comedi_device * dev, unsigned int channel)
comedi_spin_unlock_irqrestore(&dev->spinlock, flags); comedi_spin_unlock_irqrestore(&dev->spinlock, flags);
} }
static int ai_cancel(comedi_device * dev, comedi_subdevice * s) static int ai_cancel(struct comedi_device * dev, comedi_subdevice * s)
{ {
unsigned long flags; unsigned long flags;
@ -3194,7 +3194,7 @@ static int ai_cancel(comedi_device * dev, comedi_subdevice * s)
return 0; return 0;
} }
static int ao_winsn(comedi_device * dev, comedi_subdevice * s, static int ao_winsn(struct comedi_device * dev, 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);
@ -3224,7 +3224,7 @@ static int ao_winsn(comedi_device * dev, comedi_subdevice * s,
return 1; return 1;
} }
static int ao_readback_insn(comedi_device * dev, comedi_subdevice * s, static int ao_readback_insn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
data[0] = priv(dev)->ao_value[CR_CHAN(insn->chanspec)]; data[0] = priv(dev)->ao_value[CR_CHAN(insn->chanspec)];
@ -3232,7 +3232,7 @@ static int ao_readback_insn(comedi_device * dev, comedi_subdevice * s,
return 1; return 1;
} }
static void set_dac_control0_reg(comedi_device * dev, const comedi_cmd * cmd) static void set_dac_control0_reg(struct comedi_device * dev, const comedi_cmd * cmd)
{ {
unsigned int bits = DAC_ENABLE_BIT | WAVEFORM_GATE_LEVEL_BIT | unsigned int bits = DAC_ENABLE_BIT | WAVEFORM_GATE_LEVEL_BIT |
WAVEFORM_GATE_ENABLE_BIT | WAVEFORM_GATE_SELECT_BIT; WAVEFORM_GATE_ENABLE_BIT | WAVEFORM_GATE_SELECT_BIT;
@ -3252,7 +3252,7 @@ static void set_dac_control0_reg(comedi_device * dev, const comedi_cmd * cmd)
writew(bits, priv(dev)->main_iobase + DAC_CONTROL0_REG); writew(bits, priv(dev)->main_iobase + DAC_CONTROL0_REG);
} }
static void set_dac_control1_reg(comedi_device * dev, const comedi_cmd * cmd) static void set_dac_control1_reg(struct comedi_device * dev, const comedi_cmd * cmd)
{ {
int i; int i;
@ -3269,7 +3269,7 @@ static void set_dac_control1_reg(comedi_device * dev, const comedi_cmd * cmd)
priv(dev)->main_iobase + DAC_CONTROL1_REG); priv(dev)->main_iobase + DAC_CONTROL1_REG);
} }
static void set_dac_select_reg(comedi_device * dev, const comedi_cmd * cmd) static void set_dac_select_reg(struct comedi_device * dev, const comedi_cmd * cmd)
{ {
uint16_t bits; uint16_t bits;
unsigned int first_channel, last_channel; unsigned int first_channel, last_channel;
@ -3284,7 +3284,7 @@ static void set_dac_select_reg(comedi_device * dev, const comedi_cmd * cmd)
writew(bits, priv(dev)->main_iobase + DAC_SELECT_REG); writew(bits, priv(dev)->main_iobase + DAC_SELECT_REG);
} }
static void set_dac_interval_regs(comedi_device * dev, const comedi_cmd * cmd) static void set_dac_interval_regs(struct comedi_device * dev, const comedi_cmd * cmd)
{ {
unsigned int divisor; unsigned int divisor;
@ -3302,7 +3302,7 @@ static void set_dac_interval_regs(comedi_device * dev, const comedi_cmd * cmd)
priv(dev)->main_iobase + DAC_SAMPLE_INTERVAL_UPPER_REG); priv(dev)->main_iobase + DAC_SAMPLE_INTERVAL_UPPER_REG);
} }
static unsigned int load_ao_dma_buffer(comedi_device * dev, static unsigned int load_ao_dma_buffer(struct comedi_device * dev,
const comedi_cmd * cmd) const comedi_cmd * cmd)
{ {
unsigned int num_bytes, buffer_index, prev_buffer_index; unsigned int num_bytes, buffer_index, prev_buffer_index;
@ -3346,7 +3346,7 @@ static unsigned int load_ao_dma_buffer(comedi_device * dev,
return num_bytes; return num_bytes;
} }
static void load_ao_dma(comedi_device * dev, const comedi_cmd * cmd) static void load_ao_dma(struct comedi_device * dev, const comedi_cmd * cmd)
{ {
unsigned int num_bytes; unsigned int num_bytes;
unsigned int next_transfer_addr; unsigned int next_transfer_addr;
@ -3368,7 +3368,7 @@ static void load_ao_dma(comedi_device * dev, const comedi_cmd * cmd)
} while (num_bytes >= DMA_BUFFER_SIZE); } while (num_bytes >= DMA_BUFFER_SIZE);
} }
static int prep_ao_dma(comedi_device * dev, const comedi_cmd * cmd) static int prep_ao_dma(struct comedi_device * dev, const comedi_cmd * cmd)
{ {
unsigned int num_bytes; unsigned int num_bytes;
int i; int i;
@ -3402,7 +3402,7 @@ static int prep_ao_dma(comedi_device * dev, const comedi_cmd * cmd)
return 0; return 0;
} }
static inline int external_ai_queue_in_use(comedi_device * dev) static inline int external_ai_queue_in_use(struct comedi_device * dev)
{ {
if (dev->read_subdev->busy) if (dev->read_subdev->busy)
return 0; return 0;
@ -3413,7 +3413,7 @@ static inline int external_ai_queue_in_use(comedi_device * dev)
return 1; return 1;
} }
static int ao_cmd(comedi_device * dev, comedi_subdevice * s) static int ao_cmd(struct comedi_device * dev, comedi_subdevice * s)
{ {
comedi_cmd *cmd = &s->async->cmd; comedi_cmd *cmd = &s->async->cmd;
@ -3438,7 +3438,7 @@ static int ao_cmd(comedi_device * dev, comedi_subdevice * s)
return 0; return 0;
} }
static int ao_inttrig(comedi_device * dev, comedi_subdevice * s, static int ao_inttrig(struct comedi_device * dev, comedi_subdevice * s,
unsigned int trig_num) unsigned int trig_num)
{ {
comedi_cmd *cmd = &s->async->cmd; comedi_cmd *cmd = &s->async->cmd;
@ -3461,7 +3461,7 @@ static int ao_inttrig(comedi_device * dev, comedi_subdevice * s,
return 0; return 0;
} }
static int ao_cmdtest(comedi_device * dev, comedi_subdevice * s, static int ao_cmdtest(struct comedi_device * dev, comedi_subdevice * s,
comedi_cmd * cmd) comedi_cmd * cmd)
{ {
int err = 0; int err = 0;
@ -3577,7 +3577,7 @@ static int ao_cmdtest(comedi_device * dev, comedi_subdevice * s,
return 0; return 0;
} }
static int ao_cancel(comedi_device * dev, comedi_subdevice * s) static int ao_cancel(struct comedi_device * dev, comedi_subdevice * s)
{ {
writew(0x0, priv(dev)->main_iobase + DAC_CONTROL0_REG); writew(0x0, priv(dev)->main_iobase + DAC_CONTROL0_REG);
abort_dma(dev, 0); abort_dma(dev, 0);
@ -3605,7 +3605,7 @@ static int dio_callback_4020(int dir, int port, int data, unsigned long iobase)
} }
} }
static int di_rbits(comedi_device * dev, comedi_subdevice * s, static int di_rbits(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
unsigned int bits; unsigned int bits;
@ -3618,7 +3618,7 @@ static int di_rbits(comedi_device * dev, comedi_subdevice * s,
return 2; return 2;
} }
static int do_wbits(comedi_device * dev, comedi_subdevice * s, static int do_wbits(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
data[0] &= 0xf; data[0] &= 0xf;
@ -3634,7 +3634,7 @@ static int do_wbits(comedi_device * dev, comedi_subdevice * s,
return 2; return 2;
} }
static int dio_60xx_config_insn(comedi_device * dev, comedi_subdevice * s, static int dio_60xx_config_insn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
unsigned int mask; unsigned int mask;
@ -3661,7 +3661,7 @@ static int dio_60xx_config_insn(comedi_device * dev, comedi_subdevice * s,
return 1; return 1;
} }
static int dio_60xx_wbits(comedi_device * dev, comedi_subdevice * s, static int dio_60xx_wbits(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
if (data[0]) { if (data[0]) {
@ -3676,7 +3676,7 @@ static int dio_60xx_wbits(comedi_device * dev, comedi_subdevice * s,
return 2; return 2;
} }
static void caldac_write(comedi_device * dev, unsigned int channel, static void caldac_write(struct comedi_device * dev, unsigned int channel,
unsigned int value) unsigned int value)
{ {
priv(dev)->caldac_state[channel] = value; priv(dev)->caldac_state[channel] = value;
@ -3694,7 +3694,7 @@ static void caldac_write(comedi_device * dev, unsigned int channel,
} }
} }
static int calib_write_insn(comedi_device * dev, comedi_subdevice * s, static int calib_write_insn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
int channel = CR_CHAN(insn->chanspec); int channel = CR_CHAN(insn->chanspec);
@ -3709,7 +3709,7 @@ static int calib_write_insn(comedi_device * dev, comedi_subdevice * s,
return 1; return 1;
} }
static int calib_read_insn(comedi_device * dev, comedi_subdevice * s, static int calib_read_insn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
unsigned int channel = CR_CHAN(insn->chanspec); unsigned int channel = CR_CHAN(insn->chanspec);
@ -3719,7 +3719,7 @@ static int calib_read_insn(comedi_device * dev, comedi_subdevice * s,
return 1; return 1;
} }
static void ad8402_write(comedi_device * dev, unsigned int channel, static void ad8402_write(struct comedi_device * dev, unsigned int channel,
unsigned int value) unsigned int value)
{ {
static const int bitstream_length = 10; static const int bitstream_length = 10;
@ -3750,7 +3750,7 @@ static void ad8402_write(comedi_device * dev, unsigned int channel,
} }
/* for pci-das6402/16, channel 0 is analog input gain and channel 1 is offset */ /* for pci-das6402/16, channel 0 is analog input gain and channel 1 is offset */
static int ad8402_write_insn(comedi_device * dev, comedi_subdevice * s, static int ad8402_write_insn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
int channel = CR_CHAN(insn->chanspec); int channel = CR_CHAN(insn->chanspec);
@ -3767,7 +3767,7 @@ static int ad8402_write_insn(comedi_device * dev, comedi_subdevice * s,
return 1; return 1;
} }
static int ad8402_read_insn(comedi_device * dev, comedi_subdevice * s, static int ad8402_read_insn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
unsigned int channel = CR_CHAN(insn->chanspec); unsigned int channel = CR_CHAN(insn->chanspec);
@ -3777,7 +3777,7 @@ static int ad8402_read_insn(comedi_device * dev, comedi_subdevice * s,
return 1; return 1;
} }
static uint16_t read_eeprom(comedi_device * dev, uint8_t address) static uint16_t read_eeprom(struct comedi_device * dev, uint8_t address)
{ {
static const int bitstream_length = 11; static const int bitstream_length = 11;
static const int read_command = 0x6; static const int read_command = 0x6;
@ -3839,7 +3839,7 @@ static uint16_t read_eeprom(comedi_device * dev, uint8_t address)
return value; return value;
} }
static int eeprom_read_insn(comedi_device * dev, comedi_subdevice * s, static int eeprom_read_insn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
data[0] = read_eeprom(dev, CR_CHAN(insn->chanspec)); data[0] = read_eeprom(dev, CR_CHAN(insn->chanspec));
@ -3851,7 +3851,7 @@ static int eeprom_read_insn(comedi_device * dev, comedi_subdevice * s,
* sets cmd members appropriately. * sets cmd members appropriately.
* adc paces conversions from master clock by dividing by (x + 3) where x is 24 bit number * adc paces conversions from master clock by dividing by (x + 3) where x is 24 bit number
*/ */
static void check_adc_timing(comedi_device * dev, comedi_cmd * cmd) static void check_adc_timing(struct comedi_device * dev, comedi_cmd * cmd)
{ {
unsigned int convert_divisor = 0, scan_divisor; unsigned int convert_divisor = 0, scan_divisor;
static const int min_convert_divisor = 3; static const int min_convert_divisor = 3;
@ -3925,7 +3925,7 @@ static unsigned int get_ao_divisor(unsigned int ns, unsigned int flags)
} }
// adjusts the size of hardware fifo (which determines block size for dma xfers) // adjusts the size of hardware fifo (which determines block size for dma xfers)
static int set_ai_fifo_size(comedi_device * dev, unsigned int num_samples) static int set_ai_fifo_size(struct comedi_device * dev, unsigned int num_samples)
{ {
unsigned int num_fifo_entries; unsigned int num_fifo_entries;
int retval; int retval;
@ -3946,14 +3946,14 @@ static int set_ai_fifo_size(comedi_device * dev, unsigned int num_samples)
} }
// query length of fifo // query length of fifo
static unsigned int ai_fifo_size(comedi_device * dev) static unsigned int ai_fifo_size(struct comedi_device * dev)
{ {
return priv(dev)->ai_fifo_segment_length * return priv(dev)->ai_fifo_segment_length *
board(dev)->ai_fifo->num_segments * board(dev)->ai_fifo->num_segments *
board(dev)->ai_fifo->sample_packing_ratio; board(dev)->ai_fifo->sample_packing_ratio;
} }
static int set_ai_fifo_segment_length(comedi_device * dev, static int set_ai_fifo_segment_length(struct comedi_device * dev,
unsigned int num_entries) unsigned int num_entries)
{ {
static const int increment_size = 0x100; static const int increment_size = 0x100;
@ -4004,7 +4004,7 @@ static int set_ai_fifo_segment_length(comedi_device * dev,
* address 7 == dac channel 1 fine offset * address 7 == dac channel 1 fine offset
*/ */
static int caldac_8800_write(comedi_device * dev, unsigned int address, static int caldac_8800_write(struct comedi_device * dev, unsigned int address,
uint8_t value) uint8_t value)
{ {
static const int num_caldac_channels = 8; static const int num_caldac_channels = 8;
@ -4036,7 +4036,7 @@ static int caldac_8800_write(comedi_device * dev, unsigned int address,
} }
// 4020 caldacs // 4020 caldacs
static int caldac_i2c_write(comedi_device * dev, unsigned int caldac_channel, static int caldac_i2c_write(struct comedi_device * dev, unsigned int caldac_channel,
unsigned int value) unsigned int value)
{ {
uint8_t serial_bytes[3]; uint8_t serial_bytes[3];
@ -4101,7 +4101,7 @@ static const int i2c_high_comedi_udelay = 1000;
static const int i2c_low_comedi_udelay = 10; static const int i2c_low_comedi_udelay = 10;
// set i2c data line high or low // set i2c data line high or low
static void i2c_set_sda(comedi_device * dev, int state) static void i2c_set_sda(struct comedi_device * dev, int state)
{ {
static const int data_bit = CTL_EE_W; static const int data_bit = CTL_EE_W;
void *plx_control_addr = priv(dev)->plx9080_iobase + PLX_CONTROL_REG; void *plx_control_addr = priv(dev)->plx9080_iobase + PLX_CONTROL_REG;
@ -4120,7 +4120,7 @@ static void i2c_set_sda(comedi_device * dev, int state)
} }
// set i2c clock line high or low // set i2c clock line high or low
static void i2c_set_scl(comedi_device * dev, int state) static void i2c_set_scl(struct comedi_device * dev, int state)
{ {
static const int clock_bit = CTL_USERO; static const int clock_bit = CTL_USERO;
void *plx_control_addr = priv(dev)->plx9080_iobase + PLX_CONTROL_REG; void *plx_control_addr = priv(dev)->plx9080_iobase + PLX_CONTROL_REG;
@ -4138,7 +4138,7 @@ static void i2c_set_scl(comedi_device * dev, int state)
} }
} }
static void i2c_write_byte(comedi_device * dev, uint8_t byte) static void i2c_write_byte(struct comedi_device * dev, uint8_t byte)
{ {
uint8_t bit; uint8_t bit;
unsigned int num_bits = 8; unsigned int num_bits = 8;
@ -4156,7 +4156,7 @@ static void i2c_write_byte(comedi_device * dev, uint8_t byte)
} }
// we can't really read the lines, so fake it // we can't really read the lines, so fake it
static int i2c_read_ack(comedi_device * dev) static int i2c_read_ack(struct comedi_device * dev)
{ {
i2c_set_scl(dev, 0); i2c_set_scl(dev, 0);
i2c_set_sda(dev, 1); i2c_set_sda(dev, 1);
@ -4166,7 +4166,7 @@ static int i2c_read_ack(comedi_device * dev)
} }
// send start bit // send start bit
static void i2c_start(comedi_device * dev) static void i2c_start(struct comedi_device * dev)
{ {
i2c_set_scl(dev, 1); i2c_set_scl(dev, 1);
i2c_set_sda(dev, 1); i2c_set_sda(dev, 1);
@ -4174,7 +4174,7 @@ static void i2c_start(comedi_device * dev)
} }
// send stop bit // send stop bit
static void i2c_stop(comedi_device * dev) static void i2c_stop(struct comedi_device * dev)
{ {
i2c_set_scl(dev, 0); i2c_set_scl(dev, 0);
i2c_set_sda(dev, 0); i2c_set_sda(dev, 0);
@ -4182,7 +4182,7 @@ static void i2c_stop(comedi_device * dev)
i2c_set_sda(dev, 1); i2c_set_sda(dev, 1);
} }
static void i2c_write(comedi_device * dev, unsigned int address, static void i2c_write(struct comedi_device * dev, unsigned int address,
const uint8_t * data, unsigned int length) const uint8_t * data, unsigned int length)
{ {
unsigned int i; unsigned int i;

42
drivers/staging/comedi/drivers/cb_pcidda.c
View File

@ -210,7 +210,7 @@ MODULE_DEVICE_TABLE(pci, cb_pcidda_pci_table);
/* this structure is for data unique to this hardware driver. If /* this structure is for data unique to this hardware driver. If
several hardware drivers keep similar information in this structure, several hardware drivers keep similar information in this structure,
feel free to suggest moving the variable to the comedi_device struct. */ feel free to suggest moving the variable to the struct comedi_device struct. */
typedef struct { typedef struct {
int data; int data;
@ -232,20 +232,20 @@ typedef struct {
*/ */
#define devpriv ((cb_pcidda_private *)dev->private) #define devpriv ((cb_pcidda_private *)dev->private)
static int cb_pcidda_attach(comedi_device * dev, comedi_devconfig * it); static int cb_pcidda_attach(struct comedi_device * dev, comedi_devconfig * it);
static int cb_pcidda_detach(comedi_device * dev); static int cb_pcidda_detach(struct comedi_device * dev);
//static int cb_pcidda_ai_rinsn(comedi_device *dev,comedi_subdevice *s,comedi_insn *insn,unsigned int *data); //static int cb_pcidda_ai_rinsn(struct comedi_device *dev,comedi_subdevice *s,comedi_insn *insn,unsigned int *data);
static int cb_pcidda_ao_winsn(comedi_device * dev, comedi_subdevice * s, static int cb_pcidda_ao_winsn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
//static int cb_pcidda_ai_cmd(comedi_device *dev,comedi_subdevice *s); //static int cb_pcidda_ai_cmd(struct comedi_device *dev,comedi_subdevice *s);
//static int cb_pcidda_ai_cmdtest(comedi_device *dev,comedi_subdevice *s, comedi_cmd *cmd); //static int cb_pcidda_ai_cmdtest(struct comedi_device *dev,comedi_subdevice *s, comedi_cmd *cmd);
//static int cb_pcidda_ns_to_timer(unsigned int *ns,int round); //static int cb_pcidda_ns_to_timer(unsigned int *ns,int round);
static unsigned int cb_pcidda_serial_in(comedi_device * dev); static unsigned int cb_pcidda_serial_in(struct comedi_device * dev);
static void cb_pcidda_serial_out(comedi_device * dev, unsigned int value, static void cb_pcidda_serial_out(struct comedi_device * dev, unsigned int value,
unsigned int num_bits); unsigned int num_bits);
static unsigned int cb_pcidda_read_eeprom(comedi_device * dev, static unsigned int cb_pcidda_read_eeprom(struct comedi_device * dev,
unsigned int address); unsigned int address);
static void cb_pcidda_calibrate(comedi_device * dev, unsigned int channel, static void cb_pcidda_calibrate(struct comedi_device * dev, unsigned int channel,
unsigned int range); unsigned int range);
/* /*
@ -265,7 +265,7 @@ static comedi_driver driver_cb_pcidda = {
* Attach is called by the Comedi core to configure the driver * Attach is called by the Comedi core to configure the driver
* for a particular board. * for a particular board.
*/ */
static int cb_pcidda_attach(comedi_device * dev, comedi_devconfig * it) static int cb_pcidda_attach(struct comedi_device * dev, comedi_devconfig * it)
{ {
comedi_subdevice *s; comedi_subdevice *s;
struct pci_dev *pcidev; struct pci_dev *pcidev;
@ -385,7 +385,7 @@ static int cb_pcidda_attach(comedi_device * dev, comedi_devconfig * it)
* allocated by _attach(). dev->private and dev->subdevices are * allocated by _attach(). dev->private and dev->subdevices are
* deallocated automatically by the core. * deallocated automatically by the core.
*/ */
static int cb_pcidda_detach(comedi_device * dev) static int cb_pcidda_detach(struct comedi_device * dev)
{ {
/* /*
* Deallocate the I/O ports. * Deallocate the I/O ports.
@ -413,7 +413,7 @@ static int cb_pcidda_detach(comedi_device * dev)
* I will program this later... ;-) * I will program this later... ;-)
*/ */
#if 0 #if 0
static int cb_pcidda_ai_cmd(comedi_device * dev, comedi_subdevice * s) static int cb_pcidda_ai_cmd(struct comedi_device * dev, comedi_subdevice * s)
{ {
printk("cb_pcidda_ai_cmd\n"); printk("cb_pcidda_ai_cmd\n");
printk("subdev: %d\n", cmd->subdev); printk("subdev: %d\n", cmd->subdev);
@ -432,7 +432,7 @@ static int cb_pcidda_ai_cmd(comedi_device * dev, comedi_subdevice * s)
#endif #endif
#if 0 #if 0
static int cb_pcidda_ai_cmdtest(comedi_device * dev, comedi_subdevice * s, static int cb_pcidda_ai_cmdtest(struct comedi_device * dev, comedi_subdevice * s,
comedi_cmd * cmd) comedi_cmd * cmd)
{ {
int err = 0; int err = 0;
@ -598,7 +598,7 @@ static int cb_pcidda_ns_to_timer(unsigned int *ns, int round)
} }
#endif #endif
static int cb_pcidda_ao_winsn(comedi_device * dev, comedi_subdevice * s, static int cb_pcidda_ao_winsn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
unsigned int command; unsigned int command;
@ -648,7 +648,7 @@ static int cb_pcidda_ao_winsn(comedi_device * dev, comedi_subdevice * s,
} }
// lowlevel read from eeprom // lowlevel read from eeprom
static unsigned int cb_pcidda_serial_in(comedi_device * dev) static unsigned int cb_pcidda_serial_in(struct comedi_device * dev)
{ {
unsigned int value = 0; unsigned int value = 0;
int i; int i;
@ -665,7 +665,7 @@ static unsigned int cb_pcidda_serial_in(comedi_device * dev)
} }
// lowlevel write to eeprom/dac // lowlevel write to eeprom/dac
static void cb_pcidda_serial_out(comedi_device * dev, unsigned int value, static void cb_pcidda_serial_out(struct comedi_device * dev, unsigned int value,
unsigned int num_bits) unsigned int num_bits)
{ {
int i; int i;
@ -681,7 +681,7 @@ static void cb_pcidda_serial_out(comedi_device * dev, unsigned int value,
} }
// reads a 16 bit value from board's eeprom // reads a 16 bit value from board's eeprom
static unsigned int cb_pcidda_read_eeprom(comedi_device * dev, static unsigned int cb_pcidda_read_eeprom(struct comedi_device * dev,
unsigned int address) unsigned int address)
{ {
unsigned int i; unsigned int i;
@ -715,7 +715,7 @@ static unsigned int cb_pcidda_read_eeprom(comedi_device * dev,
} }
// writes to 8 bit calibration dacs // writes to 8 bit calibration dacs
static void cb_pcidda_write_caldac(comedi_device * dev, unsigned int caldac, static void cb_pcidda_write_caldac(struct comedi_device * dev, unsigned int caldac,
unsigned int channel, unsigned int value) unsigned int channel, unsigned int value)
{ {
unsigned int cal2_bits; unsigned int cal2_bits;
@ -801,7 +801,7 @@ static unsigned int eeprom_fine_byte(unsigned int word)
} }
// set caldacs to eeprom values for given channel and range // set caldacs to eeprom values for given channel and range
static void cb_pcidda_calibrate(comedi_device * dev, unsigned int channel, static void cb_pcidda_calibrate(struct comedi_device * dev, unsigned int channel,
unsigned int range) unsigned int range)
{ {
unsigned int coarse_offset, fine_offset, coarse_gain, fine_gain; unsigned int coarse_offset, fine_offset, coarse_gain, fine_gain;

10
drivers/staging/comedi/drivers/cb_pcidio.c
View File

@ -102,7 +102,7 @@ MODULE_DEVICE_TABLE(pci, pcidio_pci_table);
/* this structure is for data unique to this hardware driver. If /* this structure is for data unique to this hardware driver. If
several hardware drivers keep similar information in this structure, several hardware drivers keep similar information in this structure,
feel free to suggest moving the variable to the comedi_device struct. */ feel free to suggest moving the variable to the struct comedi_device struct. */
typedef struct { typedef struct {
int data; // curently unused int data; // curently unused
@ -127,8 +127,8 @@ typedef struct {
* the board, and also about the kernel module that contains * the board, and also about the kernel module that contains
* the device code. * the device code.
*/ */
static int pcidio_attach(comedi_device * dev, comedi_devconfig * it); static int pcidio_attach(struct comedi_device * dev, comedi_devconfig * it);
static int pcidio_detach(comedi_device * dev); static int pcidio_detach(struct comedi_device * dev);
static comedi_driver driver_cb_pcidio = { static comedi_driver driver_cb_pcidio = {
driver_name:"cb_pcidio", driver_name:"cb_pcidio",
module:THIS_MODULE, module:THIS_MODULE,
@ -166,7 +166,7 @@ static comedi_driver driver_cb_pcidio = {
* in the driver structure, dev->board_ptr contains that * in the driver structure, dev->board_ptr contains that
* address. * address.
*/ */
static int pcidio_attach(comedi_device * dev, comedi_devconfig * it) static int pcidio_attach(struct comedi_device * dev, comedi_devconfig * it)
{ {
struct pci_dev *pcidev = NULL; struct pci_dev *pcidev = NULL;
int index; int index;
@ -267,7 +267,7 @@ static int pcidio_attach(comedi_device * dev, comedi_devconfig * it)
* allocated by _attach(). dev->private and dev->subdevices are * allocated by _attach(). dev->private and dev->subdevices are
* deallocated automatically by the core. * deallocated automatically by the core.
*/ */
static int pcidio_detach(comedi_device * dev) static int pcidio_detach(struct comedi_device * dev)
{ {
printk("comedi%d: cb_pcidio: remove\n", dev->minor); printk("comedi%d: cb_pcidio: remove\n", dev->minor);
if (devpriv) { if (devpriv) {

22
drivers/staging/comedi/drivers/cb_pcimdas.c
View File

@ -138,7 +138,7 @@ MODULE_DEVICE_TABLE(pci, cb_pcimdas_pci_table);
/* this structure is for data unique to this hardware driver. If /* this structure is for data unique to this hardware driver. If
several hardware drivers keep similar information in this structure, several hardware drivers keep similar information in this structure,
feel free to suggest moving the variable to the comedi_device struct. */ feel free to suggest moving the variable to the struct comedi_device struct. */
typedef struct { typedef struct {
int data; int data;
@ -175,8 +175,8 @@ typedef struct {
* the board, and also about the kernel module that contains * the board, and also about the kernel module that contains
* the device code. * the device code.
*/ */
static int cb_pcimdas_attach(comedi_device * dev, comedi_devconfig * it); static int cb_pcimdas_attach(struct comedi_device * dev, comedi_devconfig * it);
static int cb_pcimdas_detach(comedi_device * dev); static int cb_pcimdas_detach(struct comedi_device * dev);
static comedi_driver driver_cb_pcimdas = { static comedi_driver driver_cb_pcimdas = {
driver_name:"cb_pcimdas", driver_name:"cb_pcimdas",
module:THIS_MODULE, module:THIS_MODULE,
@ -184,11 +184,11 @@ static comedi_driver driver_cb_pcimdas = {
detach:cb_pcimdas_detach, detach:cb_pcimdas_detach,
}; };
static int cb_pcimdas_ai_rinsn(comedi_device * dev, comedi_subdevice * s, static int cb_pcimdas_ai_rinsn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int cb_pcimdas_ao_winsn(comedi_device * dev, comedi_subdevice * s, static int cb_pcimdas_ao_winsn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int cb_pcimdas_ao_rinsn(comedi_device * dev, comedi_subdevice * s, static int cb_pcimdas_ao_rinsn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
/* /*
@ -197,7 +197,7 @@ static int cb_pcimdas_ao_rinsn(comedi_device * dev, comedi_subdevice * s,
* in the driver structure, dev->board_ptr contains that * in the driver structure, dev->board_ptr contains that
* address. * address.
*/ */
static int cb_pcimdas_attach(comedi_device * dev, comedi_devconfig * it) static int cb_pcimdas_attach(struct comedi_device * dev, comedi_devconfig * it)
{ {
comedi_subdevice *s; comedi_subdevice *s;
struct pci_dev *pcidev; struct pci_dev *pcidev;
@ -342,7 +342,7 @@ static int cb_pcimdas_attach(comedi_device * dev, comedi_devconfig * it)
* allocated by _attach(). dev->private and dev->subdevices are * allocated by _attach(). dev->private and dev->subdevices are
* deallocated automatically by the core. * deallocated automatically by the core.
*/ */
static int cb_pcimdas_detach(comedi_device * dev) static int cb_pcimdas_detach(struct comedi_device * dev)
{ {
#ifdef CBPCIMDAS_DEBUG #ifdef CBPCIMDAS_DEBUG
if (devpriv) { if (devpriv) {
@ -372,7 +372,7 @@ static int cb_pcimdas_detach(comedi_device * dev)
* "instructions" read/write data in "one-shot" or "software-triggered" * "instructions" read/write data in "one-shot" or "software-triggered"
* mode. * mode.
*/ */
static int cb_pcimdas_ai_rinsn(comedi_device * dev, comedi_subdevice * s, static int cb_pcimdas_ai_rinsn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
int n, i; int n, i;
@ -437,7 +437,7 @@ static int cb_pcimdas_ai_rinsn(comedi_device * dev, comedi_subdevice * s,
return n; return n;
} }
static int cb_pcimdas_ao_winsn(comedi_device * dev, comedi_subdevice * s, static int cb_pcimdas_ao_winsn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
int i; int i;
@ -465,7 +465,7 @@ static int cb_pcimdas_ao_winsn(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 cb_pcimdas_ao_rinsn(comedi_device * dev, comedi_subdevice * s, static int cb_pcimdas_ao_rinsn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
int i; int i;

22
drivers/staging/comedi/drivers/cb_pcimdda.c
View File

@ -154,7 +154,7 @@ MODULE_DEVICE_TABLE(pci, pci_table);
/* this structure is for data unique to this hardware driver. If /* this structure is for data unique to this hardware driver. If
several hardware drivers keep similar information in this structure, several hardware drivers keep similar information in this structure,
feel free to suggest moving the variable to the comedi_device struct. */ feel free to suggest moving the variable to the struct comedi_device struct. */
typedef struct { typedef struct {
unsigned long registers; /* set by probe */ unsigned long registers; /* set by probe */
unsigned long dio_registers; unsigned long dio_registers;
@ -181,8 +181,8 @@ typedef struct {
* the board, and also about the kernel module that contains * the board, and also about the kernel module that contains
* the device code. * the device code.
*/ */
static int attach(comedi_device * dev, comedi_devconfig * it); static int attach(struct comedi_device * dev, comedi_devconfig * it);
static int detach(comedi_device * dev); static int detach(struct comedi_device * dev);
static comedi_driver cb_pcimdda_driver = { static comedi_driver cb_pcimdda_driver = {
driver_name:"cb_pcimdda", driver_name:"cb_pcimdda",
module:THIS_MODULE, module:THIS_MODULE,
@ -197,9 +197,9 @@ MODULE_DESCRIPTION("Comedi low-level driver for the Computerboards PCIM-DDA "
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
COMEDI_PCI_INITCLEANUP_NOMODULE(cb_pcimdda_driver, pci_table); COMEDI_PCI_INITCLEANUP_NOMODULE(cb_pcimdda_driver, pci_table);
static int ao_winsn(comedi_device * dev, comedi_subdevice * s, static int ao_winsn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int ao_rinsn(comedi_device * dev, comedi_subdevice * s, static int ao_rinsn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
/*--------------------------------------------------------------------------- /*---------------------------------------------------------------------------
@ -226,7 +226,7 @@ static inline unsigned int figure_out_maxdata(int bits)
* *
* Otherwise, returns a -errno on error * Otherwise, returns a -errno on error
*/ */
static int probe(comedi_device * dev, const comedi_devconfig * it); static int probe(struct comedi_device * dev, const comedi_devconfig * it);
/*--------------------------------------------------------------------------- /*---------------------------------------------------------------------------
FUNCTION DEFINITIONS FUNCTION DEFINITIONS
@ -238,7 +238,7 @@ static int probe(comedi_device * dev, const comedi_devconfig * it);
* in the driver structure, dev->board_ptr contains that * in the driver structure, dev->board_ptr contains that
* address. * address.
*/ */
static int attach(comedi_device * dev, comedi_devconfig * it) static int attach(struct comedi_device * dev, comedi_devconfig * it)
{ {
comedi_subdevice *s; comedi_subdevice *s;
int err; int err;
@ -326,7 +326,7 @@ static int attach(comedi_device * dev, comedi_devconfig * it)
* allocated by _attach(). dev->private and dev->subdevices are * allocated by _attach(). dev->private and dev->subdevices are
* deallocated automatically by the core. * deallocated automatically by the core.
*/ */
static int detach(comedi_device * dev) static int detach(struct comedi_device * dev)
{ {
if (devpriv) { if (devpriv) {
@ -352,7 +352,7 @@ static int detach(comedi_device * dev)
return 0; return 0;
} }
static int ao_winsn(comedi_device * dev, comedi_subdevice * s, static int ao_winsn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
int i; int i;
@ -391,7 +391,7 @@ static int ao_winsn(comedi_device * dev, comedi_subdevice * s,
all AO channels update simultaneously. This is useful for some control all AO channels update simultaneously. This is useful for some control
applications, I would imagine. applications, I would imagine.
*/ */
static int ao_rinsn(comedi_device * dev, comedi_subdevice * s, static int ao_rinsn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
int i; int i;
@ -425,7 +425,7 @@ static int ao_rinsn(comedi_device * dev, comedi_subdevice * s,
* *
* Otherwise, returns a -errno on error * Otherwise, returns a -errno on error
*/ */
static int probe(comedi_device * dev, const comedi_devconfig * it) static int probe(struct comedi_device * dev, const comedi_devconfig * it)
{ {
struct pci_dev *pcidev; struct pci_dev *pcidev;
int index; int index;

26
drivers/staging/comedi/drivers/comedi_bond.c
View File

@ -154,7 +154,7 @@ struct BondedDevice {
/* this structure is for data unique to this hardware driver. If /* this structure is for data unique to this hardware driver. If
several hardware drivers keep similar information in this structure, several hardware drivers keep similar information in this structure,
feel free to suggest moving the variable to the comedi_device struct. */ feel free to suggest moving the variable to the struct comedi_device struct. */
struct Private { struct Private {
# define MAX_BOARD_NAME 256 # define MAX_BOARD_NAME 256
char name[MAX_BOARD_NAME]; char name[MAX_BOARD_NAME];
@ -176,11 +176,11 @@ struct Private {
* the board, and also about the kernel module that contains * the board, and also about the kernel module that contains
* the device code. * the device code.
*/ */
static int bonding_attach(comedi_device *dev, comedi_devconfig *it); static int bonding_attach(struct comedi_device *dev, comedi_devconfig *it);
static int bonding_detach(comedi_device *dev); static int bonding_detach(struct comedi_device *dev);
/** Build Private array of all devices.. */ /** Build Private array of all devices.. */
static int doDevConfig(comedi_device *dev, comedi_devconfig *it); static int doDevConfig(struct comedi_device *dev, comedi_devconfig *it);
static void doDevUnconfig(comedi_device *dev); static void doDevUnconfig(struct comedi_device *dev);
/* Ugly implementation of realloc that always copies memory around -- I'm lazy, /* Ugly implementation of realloc that always copies memory around -- I'm lazy,
* what can I say? I like to do wasteful memcopies.. :) */ * what can I say? I like to do wasteful memcopies.. :) */
static void *Realloc(const void *ptr, size_t len, size_t old_len); static void *Realloc(const void *ptr, size_t len, size_t old_len);
@ -213,9 +213,9 @@ static comedi_driver driver_bonding = {
.num_names = sizeof(bondingBoards) / sizeof(struct BondingBoard), .num_names = sizeof(bondingBoards) / sizeof(struct BondingBoard),
}; };
static int bonding_dio_insn_bits(comedi_device *dev, comedi_subdevice *s, static int bonding_dio_insn_bits(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
static int bonding_dio_insn_config(comedi_device *dev, comedi_subdevice *s, static int bonding_dio_insn_config(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
/* /*
@ -224,7 +224,7 @@ static int bonding_dio_insn_config(comedi_device *dev, comedi_subdevice *s,
* in the driver structure, dev->board_ptr contains that * in the driver structure, dev->board_ptr contains that
* address. * address.
*/ */
static int bonding_attach(comedi_device *dev, comedi_devconfig *it) static int bonding_attach(struct comedi_device *dev, comedi_devconfig *it)
{ {
comedi_subdevice *s; comedi_subdevice *s;
@ -281,7 +281,7 @@ static int bonding_attach(comedi_device *dev, comedi_devconfig *it)
* allocated by _attach(). dev->private and dev->subdevices are * allocated by _attach(). dev->private and dev->subdevices are
* deallocated automatically by the core. * deallocated automatically by the core.
*/ */
static int bonding_detach(comedi_device *dev) static int bonding_detach(struct comedi_device *dev)
{ {
LOG_MSG("comedi%d: remove\n", dev->minor); LOG_MSG("comedi%d: remove\n", dev->minor);
doDevUnconfig(dev); doDevUnconfig(dev);
@ -293,7 +293,7 @@ static int bonding_detach(comedi_device *dev)
* 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 bonding_dio_insn_bits(comedi_device *dev, comedi_subdevice *s, static int bonding_dio_insn_bits(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data) comedi_insn *insn, unsigned int *data)
{ {
#define LSAMPL_BITS (sizeof(unsigned int)*8) #define LSAMPL_BITS (sizeof(unsigned int)*8)
@ -340,7 +340,7 @@ static int bonding_dio_insn_bits(comedi_device *dev, comedi_subdevice *s,
return insn->n; return insn->n;
} }
static int bonding_dio_insn_config(comedi_device *dev, comedi_subdevice *s, static int bonding_dio_insn_config(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data) comedi_insn *insn, unsigned int *data)
{ {
int chan = CR_CHAN(insn->chanspec), ret, io_bits = s->io_bits; int chan = CR_CHAN(insn->chanspec), ret, io_bits = s->io_bits;
@ -394,7 +394,7 @@ static void *Realloc(const void *oldmem, size_t newlen, size_t oldlen)
return newmem; return newmem;
} }
static int doDevConfig(comedi_device *dev, comedi_devconfig *it) static int doDevConfig(struct comedi_device *dev, comedi_devconfig *it)
{ {
int i; int i;
void *devs_opened[COMEDI_NUM_BOARD_MINORS]; void *devs_opened[COMEDI_NUM_BOARD_MINORS];
@ -497,7 +497,7 @@ static int doDevConfig(comedi_device *dev, comedi_devconfig *it)
return 1; return 1;
} }
static void doDevUnconfig(comedi_device *dev) static void doDevUnconfig(struct comedi_device *dev)
{ {
unsigned long devs_closed = 0; unsigned long devs_closed = 0;

2
drivers/staging/comedi/drivers/comedi_fc.c
View File

@ -85,7 +85,7 @@ unsigned int cfc_read_array_from_buffer(comedi_subdevice *subd, void *data,
} }
EXPORT_SYMBOL(cfc_read_array_from_buffer); EXPORT_SYMBOL(cfc_read_array_from_buffer);
unsigned int cfc_handle_events(comedi_device *dev, comedi_subdevice *subd) unsigned int cfc_handle_events(struct comedi_device *dev, comedi_subdevice *subd)
{ {
unsigned int events = subd->async->events; unsigned int events = subd->async->events;

2
drivers/staging/comedi/drivers/comedi_fc.h
View File

@ -50,7 +50,7 @@ extern unsigned int cfc_read_array_from_buffer(comedi_subdevice *subd,
void *data, void *data,
unsigned int num_bytes); unsigned int num_bytes);
extern unsigned int cfc_handle_events(comedi_device *dev, extern unsigned int cfc_handle_events(struct comedi_device *dev,
comedi_subdevice *subd); comedi_subdevice *subd);
static inline unsigned int cfc_bytes_per_scan(comedi_subdevice *subd) static inline unsigned int cfc_bytes_per_scan(comedi_subdevice *subd)

26
drivers/staging/comedi/drivers/comedi_parport.c
View File

@ -90,8 +90,8 @@ pin, which can be used to wake up tasks.
#define PARPORT_B 1 #define PARPORT_B 1
#define PARPORT_C 2 #define PARPORT_C 2
static int parport_attach(comedi_device *dev, comedi_devconfig *it); static int parport_attach(struct comedi_device *dev, comedi_devconfig *it);
static int parport_detach(comedi_device *dev); static int parport_detach(struct comedi_device *dev);
static comedi_driver driver_parport = { static comedi_driver driver_parport = {
.driver_name = "comedi_parport", .driver_name = "comedi_parport",
.module = THIS_MODULE, .module = THIS_MODULE,
@ -108,7 +108,7 @@ struct parport_private {
}; };
#define devpriv ((struct parport_private *)(dev->private)) #define devpriv ((struct parport_private *)(dev->private))
static int parport_insn_a(comedi_device *dev, comedi_subdevice *s, static int parport_insn_a(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data) comedi_insn *insn, unsigned int *data)
{ {
if (data[0]) { if (data[0]) {
@ -123,7 +123,7 @@ static int parport_insn_a(comedi_device *dev, comedi_subdevice *s,
return 2; return 2;
} }
static int parport_insn_config_a(comedi_device *dev, comedi_subdevice *s, static int parport_insn_config_a(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data) comedi_insn *insn, unsigned int *data)
{ {
if (data[0]) { if (data[0]) {
@ -138,7 +138,7 @@ static int parport_insn_config_a(comedi_device *dev, comedi_subdevice *s,
return 1; return 1;
} }
static int parport_insn_b(comedi_device *dev, comedi_subdevice *s, static int parport_insn_b(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data) comedi_insn *insn, unsigned int *data)
{ {
if (data[0]) { if (data[0]) {
@ -151,7 +151,7 @@ static int parport_insn_b(comedi_device *dev, comedi_subdevice *s,
return 2; return 2;
} }
static int parport_insn_c(comedi_device *dev, comedi_subdevice *s, static int parport_insn_c(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data) comedi_insn *insn, unsigned int *data)
{ {
data[0] &= 0x0f; data[0] &= 0x0f;
@ -167,7 +167,7 @@ static int parport_insn_c(comedi_device *dev, comedi_subdevice *s,
return 2; return 2;
} }
static int parport_intr_insn(comedi_device *dev, comedi_subdevice *s, static int parport_intr_insn(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data) comedi_insn *insn, unsigned int *data)
{ {
if (insn->n < 1) if (insn->n < 1)
@ -177,7 +177,7 @@ static int parport_intr_insn(comedi_device *dev, comedi_subdevice *s,
return 2; return 2;
} }
static int parport_intr_cmdtest(comedi_device *dev, comedi_subdevice *s, static int parport_intr_cmdtest(struct comedi_device *dev, comedi_subdevice *s,
comedi_cmd *cmd) comedi_cmd *cmd)
{ {
int err = 0; int err = 0;
@ -252,7 +252,7 @@ static int parport_intr_cmdtest(comedi_device *dev, comedi_subdevice *s,
return 0; return 0;
} }
static int parport_intr_cmd(comedi_device *dev, comedi_subdevice *s) static int parport_intr_cmd(struct comedi_device *dev, comedi_subdevice *s)
{ {
devpriv->c_data |= 0x10; devpriv->c_data |= 0x10;
outb(devpriv->c_data, dev->iobase + PARPORT_C); outb(devpriv->c_data, dev->iobase + PARPORT_C);
@ -262,7 +262,7 @@ static int parport_intr_cmd(comedi_device *dev, comedi_subdevice *s)
return 0; return 0;
} }
static int parport_intr_cancel(comedi_device *dev, comedi_subdevice *s) static int parport_intr_cancel(struct comedi_device *dev, comedi_subdevice *s)
{ {
printk(KERN_DEBUG "parport_intr_cancel()\n"); printk(KERN_DEBUG "parport_intr_cancel()\n");
@ -276,7 +276,7 @@ static int parport_intr_cancel(comedi_device *dev, comedi_subdevice *s)
static irqreturn_t parport_interrupt(int irq, void *d PT_REGS_ARG) static irqreturn_t parport_interrupt(int irq, void *d PT_REGS_ARG)
{ {
comedi_device *dev = d; struct comedi_device *dev = d;
comedi_subdevice *s = dev->subdevices + 3; comedi_subdevice *s = dev->subdevices + 3;
if (!devpriv->enable_irq) { if (!devpriv->enable_irq) {
@ -291,7 +291,7 @@ static irqreturn_t parport_interrupt(int irq, void *d PT_REGS_ARG)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static int parport_attach(comedi_device *dev, comedi_devconfig *it) static int parport_attach(struct comedi_device *dev, comedi_devconfig *it)
{ {
int ret; int ret;
unsigned int irq; unsigned int irq;
@ -376,7 +376,7 @@ static int parport_attach(comedi_device *dev, comedi_devconfig *it)
return 1; return 1;
} }
static int parport_detach(comedi_device *dev) static int parport_detach(struct comedi_device *dev)
{ {
printk("comedi%d: parport: remove\n", dev->minor); printk("comedi%d: parport: remove\n", dev->minor);

42
drivers/staging/comedi/drivers/comedi_rt_timer.c
View File

@ -122,11 +122,11 @@ static inline RTIME nano2count(long long ns)
* task period because analog input tends to be slow. */ * task period because analog input tends to be slow. */
#define SPEED_LIMIT 100000 /* in nanoseconds */ #define SPEED_LIMIT 100000 /* in nanoseconds */
static int timer_attach(comedi_device * dev, comedi_devconfig * it); static int timer_attach(struct comedi_device * dev, comedi_devconfig * it);
static int timer_detach(comedi_device * dev); static int timer_detach(struct comedi_device * dev);
static int timer_inttrig(comedi_device * dev, comedi_subdevice * s, static int timer_inttrig(struct comedi_device * dev, comedi_subdevice * s,
unsigned int trig_num); unsigned int trig_num);
static int timer_start_cmd(comedi_device * dev, comedi_subdevice * s); static int timer_start_cmd(struct comedi_device * dev, comedi_subdevice * s);
static comedi_driver driver_timer = { static comedi_driver driver_timer = {
module:THIS_MODULE, module:THIS_MODULE,
@ -145,7 +145,7 @@ typedef struct {
RT_TASK *scan_task; // rt task that controls conversion timing in a scan RT_TASK *scan_task; // rt task that controls conversion timing in a scan
/* io_function can point to either an input or output function /* io_function can point to either an input or output function
* depending on what kind of subdevice we are emulating for */ * depending on what kind of subdevice we are emulating for */
int (*io_function) (comedi_device * dev, comedi_cmd * cmd, int (*io_function) (struct comedi_device * dev, comedi_cmd * cmd,
unsigned int index); unsigned int index);
// RTIME has units of 1 = 838 nanoseconds // RTIME has units of 1 = 838 nanoseconds
// time at which first scan started, used to check scan timing // time at which first scan started, used to check scan timing
@ -162,7 +162,7 @@ typedef struct {
} timer_private; } timer_private;
#define devpriv ((timer_private *)dev->private) #define devpriv ((timer_private *)dev->private)
static int timer_cancel(comedi_device * dev, comedi_subdevice * s) static int timer_cancel(struct comedi_device * dev, comedi_subdevice * s)
{ {
devpriv->stop = 1; devpriv->stop = 1;
@ -170,7 +170,7 @@ static int timer_cancel(comedi_device * dev, comedi_subdevice * s)
} }
// checks for scan timing error // checks for scan timing error
inline static int check_scan_timing(comedi_device * dev, inline static int check_scan_timing(struct comedi_device * dev,
unsigned long long scan) unsigned long long scan)
{ {
RTIME now, timing_error; RTIME now, timing_error;
@ -187,7 +187,7 @@ inline static int check_scan_timing(comedi_device * dev,
} }
// checks for conversion timing error // checks for conversion timing error
inline static int check_conversion_timing(comedi_device * dev, inline static int check_conversion_timing(struct comedi_device * dev,
RTIME scan_start, unsigned int conversion) RTIME scan_start, unsigned int conversion)
{ {
RTIME now, timing_error; RTIME now, timing_error;
@ -206,7 +206,7 @@ inline static int check_conversion_timing(comedi_device * dev,
} }
// devpriv->io_function for an input subdevice // devpriv->io_function for an input subdevice
static int timer_data_read(comedi_device * dev, comedi_cmd * cmd, static int timer_data_read(struct comedi_device * dev, comedi_cmd * cmd,
unsigned int index) unsigned int index)
{ {
comedi_subdevice *s = dev->read_subdev; comedi_subdevice *s = dev->read_subdev;
@ -231,7 +231,7 @@ static int timer_data_read(comedi_device * dev, comedi_cmd * cmd,
} }
// devpriv->io_function for an output subdevice // devpriv->io_function for an output subdevice
static int timer_data_write(comedi_device * dev, comedi_cmd * cmd, static int timer_data_write(struct comedi_device * dev, comedi_cmd * cmd,
unsigned int index) unsigned int index)
{ {
comedi_subdevice *s = dev->write_subdev; comedi_subdevice *s = dev->write_subdev;
@ -266,7 +266,7 @@ static int timer_data_write(comedi_device * dev, comedi_cmd * cmd,
} }
// devpriv->io_function for DIO subdevices // devpriv->io_function for DIO subdevices
static int timer_dio_read(comedi_device * dev, comedi_cmd * cmd, static int timer_dio_read(struct comedi_device * dev, comedi_cmd * cmd,
unsigned int index) unsigned int index)
{ {
comedi_subdevice *s = dev->read_subdev; comedi_subdevice *s = dev->read_subdev;
@ -290,7 +290,7 @@ static int timer_dio_read(comedi_device * dev, comedi_cmd * cmd,
// performs scans // performs scans
static void scan_task_func(comedi_rt_task_context_t d) static void scan_task_func(comedi_rt_task_context_t d)
{ {
comedi_device *dev = (comedi_device *) d; struct comedi_device *dev = (struct comedi_device *) d;
comedi_subdevice *s = dev->subdevices + 0; comedi_subdevice *s = dev->subdevices + 0;
comedi_async *async = s->async; comedi_async *async = s->async;
comedi_cmd *cmd = &async->cmd; comedi_cmd *cmd = &async->cmd;
@ -360,7 +360,7 @@ static void scan_task_func(comedi_rt_task_context_t d)
static void timer_task_func(comedi_rt_task_context_t d) static void timer_task_func(comedi_rt_task_context_t d)
{ {
comedi_device *dev = (comedi_device *) d; struct comedi_device *dev = (struct comedi_device *) d;
comedi_subdevice *s = dev->subdevices + 0; comedi_subdevice *s = dev->subdevices + 0;
comedi_cmd *cmd = &s->async->cmd; comedi_cmd *cmd = &s->async->cmd;
int ret; int ret;
@ -396,7 +396,7 @@ static void timer_task_func(comedi_rt_task_context_t d)
} }
} }
static int timer_insn(comedi_device * dev, comedi_subdevice * s, static int timer_insn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
comedi_insn xinsn = *insn; comedi_insn xinsn = *insn;
@ -444,7 +444,7 @@ static int cmdtest_helper(comedi_cmd * cmd,
return err; return err;
} }
static int timer_cmdtest(comedi_device * dev, comedi_subdevice * s, static int timer_cmdtest(struct comedi_device * dev, comedi_subdevice * s,
comedi_cmd * cmd) comedi_cmd * cmd)
{ {
int err = 0; int err = 0;
@ -516,7 +516,7 @@ static int timer_cmdtest(comedi_device * dev, comedi_subdevice * s,
return 0; return 0;
} }
static int timer_cmd(comedi_device * dev, comedi_subdevice * s) static int timer_cmd(struct comedi_device * dev, comedi_subdevice * s)
{ {
int ret; int ret;
comedi_cmd *cmd = &s->async->cmd; comedi_cmd *cmd = &s->async->cmd;
@ -567,7 +567,7 @@ static int timer_cmd(comedi_device * dev, comedi_subdevice * s)
return 0; return 0;
} }
static int timer_inttrig(comedi_device * dev, comedi_subdevice * s, static int timer_inttrig(struct comedi_device * dev, comedi_subdevice * s,
unsigned int trig_num) unsigned int trig_num)
{ {
if (trig_num != 0) if (trig_num != 0)
@ -578,7 +578,7 @@ static int timer_inttrig(comedi_device * dev, comedi_subdevice * s,
return timer_start_cmd(dev, s); return timer_start_cmd(dev, s);
} }
static int timer_start_cmd(comedi_device * dev, comedi_subdevice * s) static int timer_start_cmd(struct comedi_device * dev, comedi_subdevice * s)
{ {
comedi_async *async = s->async; comedi_async *async = s->async;
comedi_cmd *cmd = &async->cmd; comedi_cmd *cmd = &async->cmd;
@ -607,11 +607,11 @@ static int timer_start_cmd(comedi_device * dev, comedi_subdevice * s)
return 0; return 0;
} }
static int timer_attach(comedi_device * dev, comedi_devconfig * it) static int timer_attach(struct comedi_device * dev, comedi_devconfig * it)
{ {
int ret; int ret;
comedi_subdevice *s, *emul_s; comedi_subdevice *s, *emul_s;
comedi_device *emul_dev; struct comedi_device *emul_dev;
/* These should probably be devconfig options[] */ /* These should probably be devconfig options[] */
const int timer_priority = 4; const int timer_priority = 4;
const int scan_priority = timer_priority + 1; const int scan_priority = timer_priority + 1;
@ -706,7 +706,7 @@ static int timer_attach(comedi_device * dev, comedi_devconfig * it)
} }
// free allocated resources // free allocated resources
static int timer_detach(comedi_device * dev) static int timer_detach(struct comedi_device * dev)
{ {
printk("comedi%d: timer: remove\n", dev->minor); printk("comedi%d: timer: remove\n", dev->minor);

46
drivers/staging/comedi/drivers/comedi_test.c
View File

@ -93,8 +93,8 @@ struct waveform_private {
}; };
#define devpriv ((struct waveform_private *)dev->private) #define devpriv ((struct waveform_private *)dev->private)
static int waveform_attach(comedi_device *dev, comedi_devconfig *it); static int waveform_attach(struct comedi_device *dev, comedi_devconfig *it);
static int waveform_detach(comedi_device *dev); static int waveform_detach(struct comedi_device *dev);
static comedi_driver driver_waveform = { static comedi_driver driver_waveform = {
.driver_name = "comedi_test", .driver_name = "comedi_test",
.module = THIS_MODULE, .module = THIS_MODULE,
@ -107,21 +107,21 @@ static comedi_driver driver_waveform = {
COMEDI_INITCLEANUP(driver_waveform); COMEDI_INITCLEANUP(driver_waveform);
static int waveform_ai_cmdtest(comedi_device *dev, comedi_subdevice *s, static int waveform_ai_cmdtest(struct comedi_device *dev, comedi_subdevice *s,
comedi_cmd *cmd); comedi_cmd *cmd);
static int waveform_ai_cmd(comedi_device *dev, comedi_subdevice *s); static int waveform_ai_cmd(struct comedi_device *dev, comedi_subdevice *s);
static int waveform_ai_cancel(comedi_device *dev, comedi_subdevice *s); static int waveform_ai_cancel(struct comedi_device *dev, comedi_subdevice *s);
static int waveform_ai_insn_read(comedi_device *dev, comedi_subdevice *s, static int waveform_ai_insn_read(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
static int waveform_ao_insn_write(comedi_device *dev, comedi_subdevice *s, static int waveform_ao_insn_write(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data); comedi_insn *insn, unsigned int *data);
static short fake_sawtooth(comedi_device *dev, unsigned int range, static short fake_sawtooth(struct comedi_device *dev, unsigned int range,
unsigned long current_time); unsigned long current_time);
static short fake_squarewave(comedi_device *dev, unsigned int range, static short fake_squarewave(struct comedi_device *dev, unsigned int range,
unsigned long current_time); unsigned long current_time);
static short fake_flatline(comedi_device *dev, unsigned int range, static short fake_flatline(struct comedi_device *dev, unsigned int range,
unsigned long current_time); unsigned long current_time);
static short fake_waveform(comedi_device *dev, unsigned int channel, static short fake_waveform(struct comedi_device *dev, unsigned int channel,
unsigned int range, unsigned long current_time); unsigned int range, unsigned long current_time);
/* 1000 nanosec in a microsec */ /* 1000 nanosec in a microsec */
@ -143,7 +143,7 @@ static const comedi_lrange waveform_ai_ranges = {
*/ */
static void waveform_ai_interrupt(unsigned long arg) static void waveform_ai_interrupt(unsigned long arg)
{ {
comedi_device *dev = (comedi_device *) arg; struct comedi_device *dev = (struct comedi_device *) arg;
comedi_async *async = dev->read_subdev->async; comedi_async *async = dev->read_subdev->async;
comedi_cmd *cmd = &async->cmd; comedi_cmd *cmd = &async->cmd;
unsigned int i, j; unsigned int i, j;
@ -192,7 +192,7 @@ static void waveform_ai_interrupt(unsigned long arg)
comedi_event(dev, dev->read_subdev); comedi_event(dev, dev->read_subdev);
} }
static int waveform_attach(comedi_device *dev, comedi_devconfig *it) static int waveform_attach(struct comedi_device *dev, comedi_devconfig *it)
{ {
comedi_subdevice *s; comedi_subdevice *s;
int amplitude = it->options[0]; int amplitude = it->options[0];
@ -259,7 +259,7 @@ static int waveform_attach(comedi_device *dev, comedi_devconfig *it)
return 1; return 1;
} }
static int waveform_detach(comedi_device *dev) static int waveform_detach(struct comedi_device *dev)
{ {
printk("comedi%d: comedi_test: remove\n", dev->minor); printk("comedi%d: comedi_test: remove\n", dev->minor);
@ -269,7 +269,7 @@ static int waveform_detach(comedi_device *dev)
return 0; return 0;
} }
static int waveform_ai_cmdtest(comedi_device *dev, comedi_subdevice *s, static int waveform_ai_cmdtest(struct comedi_device *dev, comedi_subdevice *s,
comedi_cmd *cmd) comedi_cmd *cmd)
{ {
int err = 0; int err = 0;
@ -397,7 +397,7 @@ static int waveform_ai_cmdtest(comedi_device *dev, comedi_subdevice *s,
return 0; return 0;
} }
static int waveform_ai_cmd(comedi_device *dev, comedi_subdevice *s) static int waveform_ai_cmd(struct comedi_device *dev, comedi_subdevice *s)
{ {
comedi_cmd *cmd = &s->async->cmd; comedi_cmd *cmd = &s->async->cmd;
@ -429,14 +429,14 @@ static int waveform_ai_cmd(comedi_device *dev, comedi_subdevice *s)
return 0; return 0;
} }
static int waveform_ai_cancel(comedi_device *dev, comedi_subdevice *s) static int waveform_ai_cancel(struct comedi_device *dev, comedi_subdevice *s)
{ {
devpriv->timer_running = 0; devpriv->timer_running = 0;
del_timer(&devpriv->timer); del_timer(&devpriv->timer);
return 0; return 0;
} }
static short fake_sawtooth(comedi_device *dev, unsigned int range_index, static short fake_sawtooth(struct comedi_device *dev, unsigned int range_index,
unsigned long current_time) unsigned long current_time)
{ {
comedi_subdevice *s = dev->read_subdev; comedi_subdevice *s = dev->read_subdev;
@ -457,7 +457,7 @@ static short fake_sawtooth(comedi_device *dev, unsigned int range_index,
return offset + value; return offset + value;
} }
static short fake_squarewave(comedi_device *dev, unsigned int range_index, static short fake_squarewave(struct comedi_device *dev, unsigned int range_index,
unsigned long current_time) unsigned long current_time)
{ {
comedi_subdevice *s = dev->read_subdev; comedi_subdevice *s = dev->read_subdev;
@ -476,14 +476,14 @@ static short fake_squarewave(comedi_device *dev, unsigned int range_index,
return offset + value; return offset + value;
} }
static short fake_flatline(comedi_device *dev, unsigned int range_index, static short fake_flatline(struct comedi_device *dev, unsigned int range_index,
unsigned long current_time) unsigned long current_time)
{ {
return dev->read_subdev->maxdata / 2; return dev->read_subdev->maxdata / 2;
} }
/* generates a different waveform depending on what channel is read */ /* generates a different waveform depending on what channel is read */
static short fake_waveform(comedi_device *dev, unsigned int channel, static short fake_waveform(struct comedi_device *dev, unsigned int channel,
unsigned int range, unsigned long current_time) unsigned int range, unsigned long current_time)
{ {
enum { enum {
@ -504,7 +504,7 @@ static short fake_waveform(comedi_device *dev, unsigned int channel,
return fake_flatline(dev, range, current_time); return fake_flatline(dev, range, current_time);
} }
static int waveform_ai_insn_read(comedi_device *dev, comedi_subdevice *s, static int waveform_ai_insn_read(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data) comedi_insn *insn, unsigned int *data)
{ {
int i, chan = CR_CHAN(insn->chanspec); int i, chan = CR_CHAN(insn->chanspec);
@ -515,7 +515,7 @@ static int waveform_ai_insn_read(comedi_device *dev, comedi_subdevice *s,
return insn->n; return insn->n;
} }
static int waveform_ao_insn_write(comedi_device *dev, comedi_subdevice *s, static int waveform_ao_insn_write(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data) comedi_insn *insn, unsigned int *data)
{ {
int i, chan = CR_CHAN(insn->chanspec); int i, chan = CR_CHAN(insn->chanspec);

20
drivers/staging/comedi/drivers/contec_pci_dio.c
View File

@ -75,8 +75,8 @@ typedef struct {
#define devpriv ((contec_private *)dev->private) #define devpriv ((contec_private *)dev->private)
static int contec_attach(comedi_device * dev, comedi_devconfig * it); static int contec_attach(struct comedi_device * dev, comedi_devconfig * it);
static int contec_detach(comedi_device * dev); static int contec_detach(struct comedi_device * dev);
static comedi_driver driver_contec = { static comedi_driver driver_contec = {
driver_name:"contec_pci_dio", driver_name:"contec_pci_dio",
module:THIS_MODULE, module:THIS_MODULE,
@ -85,19 +85,19 @@ static comedi_driver driver_contec = {
}; };
/* Classic digital IO */ /* Classic digital IO */
static int contec_di_insn_bits(comedi_device * dev, comedi_subdevice * s, static int contec_di_insn_bits(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int contec_do_insn_bits(comedi_device * dev, comedi_subdevice * s, static int contec_do_insn_bits(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
#if 0 #if 0
static int contec_cmdtest(comedi_device * dev, comedi_subdevice * s, static int contec_cmdtest(struct comedi_device * dev, comedi_subdevice * s,
comedi_cmd * cmd); comedi_cmd * cmd);
static int contec_ns_to_timer(unsigned int *ns, int round); static int contec_ns_to_timer(unsigned int *ns, int round);
#endif #endif
static int contec_attach(comedi_device * dev, comedi_devconfig * it) static int contec_attach(struct comedi_device * dev, comedi_devconfig * it)
{ {
struct pci_dev *pcidev; struct pci_dev *pcidev;
comedi_subdevice *s; comedi_subdevice *s;
@ -164,7 +164,7 @@ static int contec_attach(comedi_device * dev, comedi_devconfig * it)
return -EIO; return -EIO;
} }
static int contec_detach(comedi_device * dev) static int contec_detach(struct comedi_device * dev)
{ {
printk("comedi%d: contec: remove\n", dev->minor); printk("comedi%d: contec: remove\n", dev->minor);
@ -179,7 +179,7 @@ static int contec_detach(comedi_device * dev)
} }
#if 0 #if 0
static int contec_cmdtest(comedi_device * dev, comedi_subdevice * s, static int contec_cmdtest(struct comedi_device * dev, comedi_subdevice * s,
comedi_cmd * cmd) comedi_cmd * cmd)
{ {
printk("contec_cmdtest called\n"); printk("contec_cmdtest called\n");
@ -192,7 +192,7 @@ static int contec_ns_to_timer(unsigned int *ns, int round)
} }
#endif #endif
static int contec_do_insn_bits(comedi_device * dev, comedi_subdevice * s, static int contec_do_insn_bits(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
@ -212,7 +212,7 @@ static int contec_do_insn_bits(comedi_device * dev, comedi_subdevice * s,
return 2; return 2;
} }
static int contec_di_insn_bits(comedi_device * dev, comedi_subdevice * s, static int contec_di_insn_bits(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {

46
drivers/staging/comedi/drivers/daqboard2000.c
View File

@ -296,8 +296,8 @@ typedef struct daqboard2000_hw {
#define DAQBOARD2000_PosRefDacSelect 0x0100 #define DAQBOARD2000_PosRefDacSelect 0x0100
#define DAQBOARD2000_NegRefDacSelect 0x0000 #define DAQBOARD2000_NegRefDacSelect 0x0000
static int daqboard2000_attach(comedi_device * dev, comedi_devconfig * it); static int daqboard2000_attach(struct comedi_device * dev, comedi_devconfig * it);
static int daqboard2000_detach(comedi_device * dev); static int daqboard2000_detach(struct comedi_device * dev);
static comedi_driver driver_daqboard2000 = { static comedi_driver driver_daqboard2000 = {
driver_name:"daqboard2000", driver_name:"daqboard2000",
@ -338,7 +338,7 @@ typedef struct {
#define devpriv ((daqboard2000_private*)dev->private) #define devpriv ((daqboard2000_private*)dev->private)
static void writeAcqScanListEntry(comedi_device * dev, u16 entry) static void writeAcqScanListEntry(struct comedi_device * dev, u16 entry)
{ {
daqboard2000_hw *fpga = devpriv->daq; daqboard2000_hw *fpga = devpriv->daq;
@ -348,7 +348,7 @@ static void writeAcqScanListEntry(comedi_device * dev, u16 entry)
fpga->acqScanListFIFO = (entry >> 8) & 0x00ff; fpga->acqScanListFIFO = (entry >> 8) & 0x00ff;
} }
static void setup_sampling(comedi_device * dev, int chan, int gain) static void setup_sampling(struct comedi_device * dev, int chan, int gain)
{ {
u16 word0, word1, word2, word3; u16 word0, word1, word2, word3;
@ -393,7 +393,7 @@ static void setup_sampling(comedi_device * dev, int chan, int gain)
writeAcqScanListEntry(dev, word3); writeAcqScanListEntry(dev, word3);
} }
static int daqboard2000_ai_insn_read(comedi_device * dev, comedi_subdevice * s, static int daqboard2000_ai_insn_read(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
int i; int i;
@ -450,7 +450,7 @@ static int daqboard2000_ai_insn_read(comedi_device * dev, comedi_subdevice * s,
return i; return i;
} }
static int daqboard2000_ao_insn_read(comedi_device * dev, comedi_subdevice * s, static int daqboard2000_ao_insn_read(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
int i; int i;
@ -463,7 +463,7 @@ static int daqboard2000_ao_insn_read(comedi_device * dev, comedi_subdevice * s,
return i; return i;
} }
static int daqboard2000_ao_insn_write(comedi_device * dev, comedi_subdevice * s, static int daqboard2000_ao_insn_write(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
int i; int i;
@ -494,7 +494,7 @@ static int daqboard2000_ao_insn_write(comedi_device * dev, comedi_subdevice * s,
return i; return i;
} }
static void daqboard2000_resetLocalBus(comedi_device * dev) static void daqboard2000_resetLocalBus(struct comedi_device * dev)
{ {
printk("daqboard2000_resetLocalBus\n"); printk("daqboard2000_resetLocalBus\n");
writel(DAQBOARD2000_SECRLocalBusHi, devpriv->plx + 0x6c); writel(DAQBOARD2000_SECRLocalBusHi, devpriv->plx + 0x6c);
@ -503,7 +503,7 @@ static void daqboard2000_resetLocalBus(comedi_device * dev)
comedi_udelay(10000); comedi_udelay(10000);
} }
static void daqboard2000_reloadPLX(comedi_device * dev) static void daqboard2000_reloadPLX(struct comedi_device * dev)
{ {
printk("daqboard2000_reloadPLX\n"); printk("daqboard2000_reloadPLX\n");
writel(DAQBOARD2000_SECRReloadLo, devpriv->plx + 0x6c); writel(DAQBOARD2000_SECRReloadLo, devpriv->plx + 0x6c);
@ -514,7 +514,7 @@ static void daqboard2000_reloadPLX(comedi_device * dev)
comedi_udelay(10000); comedi_udelay(10000);
} }
static void daqboard2000_pulseProgPin(comedi_device * dev) static void daqboard2000_pulseProgPin(struct comedi_device * dev)
{ {
printk("daqboard2000_pulseProgPin 1\n"); printk("daqboard2000_pulseProgPin 1\n");
writel(DAQBOARD2000_SECRProgPinHi, devpriv->plx + 0x6c); writel(DAQBOARD2000_SECRProgPinHi, devpriv->plx + 0x6c);
@ -523,7 +523,7 @@ static void daqboard2000_pulseProgPin(comedi_device * dev)
comedi_udelay(10000); /* Not in the original code, but I like symmetry... */ comedi_udelay(10000); /* Not in the original code, but I like symmetry... */
} }
static int daqboard2000_pollCPLD(comedi_device * dev, int mask) static int daqboard2000_pollCPLD(struct comedi_device * dev, int mask)
{ {
int result = 0; int result = 0;
int i; int i;
@ -542,7 +542,7 @@ static int daqboard2000_pollCPLD(comedi_device * dev, int mask)
return result; return result;
} }
static int daqboard2000_writeCPLD(comedi_device * dev, int data) static int daqboard2000_writeCPLD(struct comedi_device * dev, int data)
{ {
int result = 0; int result = 0;
@ -555,7 +555,7 @@ static int daqboard2000_writeCPLD(comedi_device * dev, int data)
return result; return result;
} }
static int initialize_daqboard2000(comedi_device * dev, static int initialize_daqboard2000(struct comedi_device * dev,
unsigned char *cpld_array, int len) unsigned char *cpld_array, int len)
{ {
int result = -EIO; int result = -EIO;
@ -613,12 +613,12 @@ static int initialize_daqboard2000(comedi_device * dev,
return result; return result;
} }
static void daqboard2000_adcStopDmaTransfer(comedi_device * dev) static void daqboard2000_adcStopDmaTransfer(struct comedi_device * dev)
{ {
/* printk("Implement: daqboard2000_adcStopDmaTransfer\n");*/ /* printk("Implement: daqboard2000_adcStopDmaTransfer\n");*/
} }
static void daqboard2000_adcDisarm(comedi_device * dev) static void daqboard2000_adcDisarm(struct comedi_device * dev)
{ {
daqboard2000_hw *fpga = devpriv->daq; daqboard2000_hw *fpga = devpriv->daq;
@ -640,7 +640,7 @@ static void daqboard2000_adcDisarm(comedi_device * dev)
daqboard2000_adcStopDmaTransfer(dev); daqboard2000_adcStopDmaTransfer(dev);
} }
static void daqboard2000_activateReferenceDacs(comedi_device * dev) static void daqboard2000_activateReferenceDacs(struct comedi_device * dev)
{ {
daqboard2000_hw *fpga = devpriv->daq; daqboard2000_hw *fpga = devpriv->daq;
int timeout; int timeout;
@ -666,22 +666,22 @@ static void daqboard2000_activateReferenceDacs(comedi_device * dev)
/* printk("DAQBOARD2000_NegRefDacSelect %d\n", timeout);*/ /* printk("DAQBOARD2000_NegRefDacSelect %d\n", timeout);*/
} }
static void daqboard2000_initializeCtrs(comedi_device * dev) static void daqboard2000_initializeCtrs(struct comedi_device * dev)
{ {
/* printk("Implement: daqboard2000_initializeCtrs\n");*/ /* printk("Implement: daqboard2000_initializeCtrs\n");*/
} }
static void daqboard2000_initializeTmrs(comedi_device * dev) static void daqboard2000_initializeTmrs(struct comedi_device * dev)
{ {
/* printk("Implement: daqboard2000_initializeTmrs\n");*/ /* printk("Implement: daqboard2000_initializeTmrs\n");*/
} }
static void daqboard2000_dacDisarm(comedi_device * dev) static void daqboard2000_dacDisarm(struct comedi_device * dev)
{ {
/* printk("Implement: daqboard2000_dacDisarm\n");*/ /* printk("Implement: daqboard2000_dacDisarm\n");*/
} }
static void daqboard2000_initializeAdc(comedi_device * dev) static void daqboard2000_initializeAdc(struct comedi_device * dev)
{ {
daqboard2000_adcDisarm(dev); daqboard2000_adcDisarm(dev);
daqboard2000_activateReferenceDacs(dev); daqboard2000_activateReferenceDacs(dev);
@ -689,7 +689,7 @@ static void daqboard2000_initializeAdc(comedi_device * dev)
daqboard2000_initializeTmrs(dev); daqboard2000_initializeTmrs(dev);
} }
static void daqboard2000_initializeDac(comedi_device * dev) static void daqboard2000_initializeDac(struct comedi_device * dev)
{ {
daqboard2000_dacDisarm(dev); daqboard2000_dacDisarm(dev);
} }
@ -717,7 +717,7 @@ static int daqboard2000_8255_cb(int dir, int port, int data,
return result; return result;
} }
static int daqboard2000_attach(comedi_device * dev, comedi_devconfig * it) static int daqboard2000_attach(struct comedi_device * dev, comedi_devconfig * it)
{ {
int result = 0; int result = 0;
comedi_subdevice *s; comedi_subdevice *s;
@ -849,7 +849,7 @@ static int daqboard2000_attach(comedi_device * dev, comedi_devconfig * it)
return result; return result;
} }
static int daqboard2000_detach(comedi_device * dev) static int daqboard2000_detach(struct comedi_device * dev)
{ {
printk("comedi%d: daqboard2000: remove\n", dev->minor); printk("comedi%d: daqboard2000: remove\n", dev->minor);

42
drivers/staging/comedi/drivers/das08.c
View File

@ -154,19 +154,19 @@ driver.
/* gainlist same as _pgx_ below */ /* gainlist same as _pgx_ below */
static int das08_ai_rinsn(comedi_device * dev, comedi_subdevice * s, static int das08_ai_rinsn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int das08_di_rbits(comedi_device * dev, comedi_subdevice * s, static int das08_di_rbits(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int das08_do_wbits(comedi_device * dev, comedi_subdevice * s, static int das08_do_wbits(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int das08jr_di_rbits(comedi_device * dev, comedi_subdevice * s, static int das08jr_di_rbits(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int das08jr_do_wbits(comedi_device * dev, comedi_subdevice * s, static int das08jr_do_wbits(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int das08jr_ao_winsn(comedi_device * dev, comedi_subdevice * s, static int das08jr_ao_winsn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int das08ao_ao_winsn(comedi_device * dev, comedi_subdevice * s, static int das08ao_ao_winsn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static void i8254_set_mode_low(unsigned int base, int channel, static void i8254_set_mode_low(unsigned int base, int channel,
unsigned int mode); unsigned int mode);
@ -512,7 +512,7 @@ MODULE_DEVICE_TABLE(pci, das08_pci_table);
#define TIMEOUT 100000 #define TIMEOUT 100000
static int das08_ai_rinsn(comedi_device * dev, comedi_subdevice * s, static int das08_ai_rinsn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
int i, n; int i, n;
@ -579,7 +579,7 @@ static int das08_ai_rinsn(comedi_device * dev, comedi_subdevice * s,
return n; return n;
} }
static int das08_di_rbits(comedi_device * dev, comedi_subdevice * s, static int das08_di_rbits(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
data[0] = 0; data[0] = 0;
@ -588,7 +588,7 @@ static int das08_di_rbits(comedi_device * dev, comedi_subdevice * s,
return 2; return 2;
} }
static int das08_do_wbits(comedi_device * dev, comedi_subdevice * s, static int das08_do_wbits(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
int wbits; int wbits;
@ -611,7 +611,7 @@ static int das08_do_wbits(comedi_device * dev, comedi_subdevice * s,
return 2; return 2;
} }
static int das08jr_di_rbits(comedi_device * dev, comedi_subdevice * s, static int das08jr_di_rbits(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
data[0] = 0; data[0] = 0;
@ -620,7 +620,7 @@ static int das08jr_di_rbits(comedi_device * dev, comedi_subdevice * s,
return 2; return 2;
} }
static int das08jr_do_wbits(comedi_device * dev, comedi_subdevice * s, static int das08jr_do_wbits(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
// null bits we are going to set // null bits we are going to set
@ -634,7 +634,7 @@ static int das08jr_do_wbits(comedi_device * dev, comedi_subdevice * s,
return 2; return 2;
} }
static int das08jr_ao_winsn(comedi_device * dev, comedi_subdevice * s, static int das08jr_ao_winsn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
int n; int n;
@ -668,7 +668,7 @@ static int das08jr_ao_winsn(comedi_device * dev, comedi_subdevice * s,
* a different method to force an update. * a different method to force an update.
* *
*/ */
static int das08ao_ao_winsn(comedi_device * dev, comedi_subdevice * s, static int das08ao_ao_winsn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
int n; int n;
@ -782,7 +782,7 @@ static unsigned int i8254_read_status(struct i8254_struct *st, int channel)
return i8254_read_status_low(st->iobase, chan); return i8254_read_status_low(st->iobase, chan);
} }
static int das08_counter_read(comedi_device * dev, comedi_subdevice * s, static int das08_counter_read(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
int chan = insn->chanspec; int chan = insn->chanspec;
@ -794,7 +794,7 @@ static int das08_counter_read(comedi_device * dev, comedi_subdevice * s,
return 1; return 1;
} }
static int das08_counter_write(comedi_device * dev, comedi_subdevice * s, static int das08_counter_write(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
int chan = insn->chanspec; int chan = insn->chanspec;
@ -805,7 +805,7 @@ static int das08_counter_write(comedi_device * dev, comedi_subdevice * s,
return 1; return 1;
} }
static int das08_counter_config(comedi_device * dev, comedi_subdevice * s, static int das08_counter_config(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
int chan = insn->chanspec; int chan = insn->chanspec;
@ -827,7 +827,7 @@ static int das08_counter_config(comedi_device * dev, comedi_subdevice * s,
return 2; return 2;
} }
static int das08_attach(comedi_device * dev, comedi_devconfig * it); static int das08_attach(struct comedi_device * dev, comedi_devconfig * it);
static comedi_driver driver_das08 = { static comedi_driver driver_das08 = {
driver_name: DRV_NAME, driver_name: DRV_NAME,
@ -840,7 +840,7 @@ static comedi_driver driver_das08 = {
offset:sizeof(struct das08_board_struct), offset:sizeof(struct das08_board_struct),
}; };
int das08_common_attach(comedi_device * dev, unsigned long iobase) int das08_common_attach(struct comedi_device * dev, unsigned long iobase)
{ {
comedi_subdevice *s; comedi_subdevice *s;
int ret; int ret;
@ -952,7 +952,7 @@ int das08_common_attach(comedi_device * dev, unsigned long iobase)
return 0; return 0;
} }
static int das08_attach(comedi_device * dev, comedi_devconfig * it) static int das08_attach(struct comedi_device * dev, comedi_devconfig * it)
{ {
int ret; int ret;
unsigned long iobase; unsigned long iobase;
@ -1028,7 +1028,7 @@ static int das08_attach(comedi_device * dev, comedi_devconfig * it)
return das08_common_attach(dev, iobase); return das08_common_attach(dev, iobase);
} }
int das08_common_detach(comedi_device * dev) int das08_common_detach(struct comedi_device * dev)
{ {
printk(KERN_INFO "comedi%d: das08: remove\n", dev->minor); printk(KERN_INFO "comedi%d: das08: remove\n", dev->minor);

4
drivers/staging/comedi/drivers/das08.h
View File

@ -72,7 +72,7 @@ struct das08_private_struct {
#define NUM_DAS08_CS_BOARDS 2 #define NUM_DAS08_CS_BOARDS 2
extern struct das08_board_struct das08_cs_boards[NUM_DAS08_CS_BOARDS]; extern struct das08_board_struct das08_cs_boards[NUM_DAS08_CS_BOARDS];
int das08_common_attach(comedi_device * dev, unsigned long iobase); int das08_common_attach(struct comedi_device * dev, unsigned long iobase);
int das08_common_detach(comedi_device * dev); int das08_common_detach(struct comedi_device * dev);
#endif /* _DAS08_H */ #endif /* _DAS08_H */

4
drivers/staging/comedi/drivers/das08_cs.c
View File

@ -56,7 +56,7 @@ static struct pcmcia_device *cur_dev = NULL;
#define thisboard ((const struct das08_board_struct *)dev->board_ptr) #define thisboard ((const struct das08_board_struct *)dev->board_ptr)
static int das08_cs_attach(comedi_device * dev, comedi_devconfig * it); static int das08_cs_attach(struct comedi_device * dev, comedi_devconfig * it);
static comedi_driver driver_das08_cs = { static comedi_driver driver_das08_cs = {
driver_name:"das08_cs", driver_name:"das08_cs",
@ -69,7 +69,7 @@ static comedi_driver driver_das08_cs = {
offset:sizeof(struct das08_board_struct), offset:sizeof(struct das08_board_struct),
}; };
static int das08_cs_attach(comedi_device * dev, comedi_devconfig * it) static int das08_cs_attach(struct comedi_device * dev, comedi_devconfig * it)
{ {
int ret; int ret;
unsigned long iobase; unsigned long iobase;

72
drivers/staging/comedi/drivers/das16.c
View File

@ -326,34 +326,34 @@ struct munge_info {
unsigned have_byte:1; unsigned have_byte:1;
}; };
static int das16_ao_winsn(comedi_device * dev, comedi_subdevice * s, static int das16_ao_winsn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int das16_do_wbits(comedi_device * dev, comedi_subdevice * s, static int das16_do_wbits(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int das16_di_rbits(comedi_device * dev, comedi_subdevice * s, static int das16_di_rbits(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int das16_ai_rinsn(comedi_device * dev, comedi_subdevice * s, static int das16_ai_rinsn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int das16_cmd_test(comedi_device * dev, comedi_subdevice * s, static int das16_cmd_test(struct comedi_device * dev, comedi_subdevice * s,
comedi_cmd * cmd); comedi_cmd * cmd);
static int das16_cmd_exec(comedi_device * dev, comedi_subdevice * s); static int das16_cmd_exec(struct comedi_device * dev, comedi_subdevice * s);
static int das16_cancel(comedi_device * dev, comedi_subdevice * s); static int das16_cancel(struct comedi_device * dev, comedi_subdevice * s);
static void das16_ai_munge(comedi_device * dev, comedi_subdevice * s, static void das16_ai_munge(struct comedi_device * dev, comedi_subdevice * s,
void *array, unsigned int num_bytes, unsigned int start_chan_index); void *array, unsigned int num_bytes, unsigned int start_chan_index);
static void das16_reset(comedi_device * dev); static void das16_reset(struct comedi_device * dev);
static irqreturn_t das16_dma_interrupt(int irq, void *d PT_REGS_ARG); static irqreturn_t das16_dma_interrupt(int irq, void *d PT_REGS_ARG);
static void das16_timer_interrupt(unsigned long arg); static void das16_timer_interrupt(unsigned long arg);
static void das16_interrupt(comedi_device * dev); static void das16_interrupt(struct comedi_device * dev);
static unsigned int das16_set_pacer(comedi_device * dev, unsigned int ns, static unsigned int das16_set_pacer(struct comedi_device * dev, unsigned int ns,
int flags); int flags);
static int das1600_mode_detect(comedi_device * dev); static int das1600_mode_detect(struct comedi_device * dev);
static unsigned int das16_suggest_transfer_size(comedi_device * dev, static unsigned int das16_suggest_transfer_size(struct comedi_device * dev,
comedi_cmd cmd); comedi_cmd cmd);
static void reg_dump(comedi_device * dev); static void reg_dump(struct comedi_device * dev);
typedef struct das16_board_struct { typedef struct das16_board_struct {
const char *name; const char *name;
@ -698,8 +698,8 @@ static const struct das16_board_struct das16_boards[] = {
#define n_das16_boards ((sizeof(das16_boards))/(sizeof(das16_board))) #define n_das16_boards ((sizeof(das16_boards))/(sizeof(das16_board)))
static int das16_attach(comedi_device * dev, comedi_devconfig * it); static int das16_attach(struct comedi_device * dev, comedi_devconfig * it);
static int das16_detach(comedi_device * dev); static int das16_detach(struct comedi_device * dev);
static comedi_driver driver_das16 = { static comedi_driver driver_das16 = {
driver_name:"das16", driver_name:"das16",
module:THIS_MODULE, module:THIS_MODULE,
@ -742,7 +742,7 @@ struct das16_private_struct {
#define devpriv ((struct das16_private_struct *)(dev->private)) #define devpriv ((struct das16_private_struct *)(dev->private))
#define thisboard ((struct das16_board_struct *)(dev->board_ptr)) #define thisboard ((struct das16_board_struct *)(dev->board_ptr))
static int das16_cmd_test(comedi_device * dev, comedi_subdevice * s, static int das16_cmd_test(struct comedi_device * dev, comedi_subdevice * s,
comedi_cmd * cmd) comedi_cmd * cmd)
{ {
int err = 0, tmp; int err = 0, tmp;
@ -893,7 +893,7 @@ static int das16_cmd_test(comedi_device * dev, comedi_subdevice * s,
return 0; return 0;
} }
static int das16_cmd_exec(comedi_device * dev, comedi_subdevice * s) static int das16_cmd_exec(struct comedi_device * dev, comedi_subdevice * s)
{ {
comedi_async *async = s->async; comedi_async *async = s->async;
comedi_cmd *cmd = &async->cmd; comedi_cmd *cmd = &async->cmd;
@ -996,7 +996,7 @@ static int das16_cmd_exec(comedi_device * dev, comedi_subdevice * s)
return 0; return 0;
} }
static int das16_cancel(comedi_device * dev, comedi_subdevice * s) static int das16_cancel(struct comedi_device * dev, comedi_subdevice * s)
{ {
unsigned long flags; unsigned long flags;
@ -1023,7 +1023,7 @@ static int das16_cancel(comedi_device * dev, comedi_subdevice * s)
return 0; return 0;
} }
static void das16_reset(comedi_device * dev) static void das16_reset(struct comedi_device * dev)
{ {
outb(0, dev->iobase + DAS16_STATUS); outb(0, dev->iobase + DAS16_STATUS);
outb(0, dev->iobase + DAS16_CONTROL); outb(0, dev->iobase + DAS16_CONTROL);
@ -1031,7 +1031,7 @@ static void das16_reset(comedi_device * dev)
outb(0, dev->iobase + DAS16_CNTR_CONTROL); outb(0, dev->iobase + DAS16_CNTR_CONTROL);
} }
static int das16_ai_rinsn(comedi_device * dev, comedi_subdevice * s, static int das16_ai_rinsn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
int i, n; int i, n;
@ -1079,7 +1079,7 @@ static int das16_ai_rinsn(comedi_device * dev, comedi_subdevice * s,
return n; return n;
} }
static int das16_di_rbits(comedi_device * dev, comedi_subdevice * s, static int das16_di_rbits(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
unsigned int bits; unsigned int bits;
@ -1091,7 +1091,7 @@ static int das16_di_rbits(comedi_device * dev, comedi_subdevice * s,
return 2; return 2;
} }
static int das16_do_wbits(comedi_device * dev, comedi_subdevice * s, static int das16_do_wbits(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
unsigned int wbits; unsigned int wbits;
@ -1111,7 +1111,7 @@ static int das16_do_wbits(comedi_device * dev, comedi_subdevice * s,
return 2; return 2;
} }
static int das16_ao_winsn(comedi_device * dev, comedi_subdevice * s, static int das16_ao_winsn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
int i; int i;
@ -1138,7 +1138,7 @@ static int das16_ao_winsn(comedi_device * dev, comedi_subdevice * s,
static irqreturn_t das16_dma_interrupt(int irq, void *d PT_REGS_ARG) static irqreturn_t das16_dma_interrupt(int irq, void *d PT_REGS_ARG)
{ {
int status; int status;
comedi_device *dev = d; struct comedi_device *dev = d;
status = inb(dev->iobase + DAS16_STATUS); status = inb(dev->iobase + DAS16_STATUS);
@ -1155,7 +1155,7 @@ static irqreturn_t das16_dma_interrupt(int irq, void *d PT_REGS_ARG)
static void das16_timer_interrupt(unsigned long arg) static void das16_timer_interrupt(unsigned long arg)
{ {
comedi_device *dev = (comedi_device *) arg; struct comedi_device *dev = (struct comedi_device *) arg;
das16_interrupt(dev); das16_interrupt(dev);
@ -1169,7 +1169,7 @@ static void das16_timer_interrupt(unsigned long arg)
an even transfer count after disabling dma an even transfer count after disabling dma
channel. channel.
*/ */
static int disable_dma_on_even(comedi_device * dev) static int disable_dma_on_even(struct comedi_device * dev)
{ {
int residue; int residue;
int i; int i;
@ -1197,7 +1197,7 @@ static int disable_dma_on_even(comedi_device * dev)
return residue; return residue;
} }
static void das16_interrupt(comedi_device * dev) static void das16_interrupt(struct comedi_device * dev)
{ {
unsigned long dma_flags, spin_flags; unsigned long dma_flags, spin_flags;
comedi_subdevice *s = dev->read_subdev; comedi_subdevice *s = dev->read_subdev;
@ -1273,7 +1273,7 @@ static void das16_interrupt(comedi_device * dev)
cfc_handle_events(dev, s); cfc_handle_events(dev, s);
} }
static unsigned int das16_set_pacer(comedi_device * dev, unsigned int ns, static unsigned int das16_set_pacer(struct comedi_device * dev, unsigned int ns,
int rounding_flags) int rounding_flags)
{ {
i8253_cascade_ns_to_timer_2div(devpriv->clockbase, &(devpriv->divisor1), i8253_cascade_ns_to_timer_2div(devpriv->clockbase, &(devpriv->divisor1),
@ -1286,7 +1286,7 @@ static unsigned int das16_set_pacer(comedi_device * dev, unsigned int ns,
return ns; return ns;
} }
static void reg_dump(comedi_device * dev) static void reg_dump(struct comedi_device * dev)
{ {
DEBUG_PRINT("********DAS1600 REGISTER DUMP********\n"); DEBUG_PRINT("********DAS1600 REGISTER DUMP********\n");
DEBUG_PRINT("DAS16_MUX: %x\n", inb(dev->iobase + DAS16_MUX)); DEBUG_PRINT("DAS16_MUX: %x\n", inb(dev->iobase + DAS16_MUX));
@ -1304,7 +1304,7 @@ static void reg_dump(comedi_device * dev)
inb(dev->iobase + DAS1600_STATUS_B)); inb(dev->iobase + DAS1600_STATUS_B));
} }
static int das16_probe(comedi_device * dev, comedi_devconfig * it) static int das16_probe(struct comedi_device * dev, comedi_devconfig * it)
{ {
int status; int status;
int diobits; int diobits;
@ -1338,7 +1338,7 @@ static int das16_probe(comedi_device * dev, comedi_devconfig * it)
return 0; return 0;
} }
static int das1600_mode_detect(comedi_device * dev) static int das1600_mode_detect(struct comedi_device * dev)
{ {
int status = 0; int status = 0;
@ -1366,7 +1366,7 @@ static int das1600_mode_detect(comedi_device * dev)
* 3 Clock speed (in MHz) * 3 Clock speed (in MHz)
*/ */
static int das16_attach(comedi_device * dev, comedi_devconfig * it) static int das16_attach(struct comedi_device * dev, comedi_devconfig * it)
{ {
comedi_subdevice *s; comedi_subdevice *s;
int ret; int ret;
@ -1630,7 +1630,7 @@ static int das16_attach(comedi_device * dev, comedi_devconfig * it)
return 0; return 0;
} }
static int das16_detach(comedi_device * dev) static int das16_detach(struct comedi_device * dev)
{ {
printk("comedi%d: das16: remove\n", dev->minor); printk("comedi%d: das16: remove\n", dev->minor);
@ -1674,7 +1674,7 @@ static int das16_detach(comedi_device * dev)
COMEDI_INITCLEANUP(driver_das16); COMEDI_INITCLEANUP(driver_das16);
// utility function that suggests a dma transfer size in bytes // utility function that suggests a dma transfer size in bytes
static unsigned int das16_suggest_transfer_size(comedi_device * dev, static unsigned int das16_suggest_transfer_size(struct comedi_device * dev,
comedi_cmd cmd) comedi_cmd cmd)
{ {
unsigned int size; unsigned int size;
@ -1715,7 +1715,7 @@ static unsigned int das16_suggest_transfer_size(comedi_device * dev,
return size; return size;
} }
static void das16_ai_munge(comedi_device * dev, comedi_subdevice * s, static void das16_ai_munge(struct comedi_device * dev, comedi_subdevice * s,
void *array, unsigned int num_bytes, unsigned int start_chan_index) void *array, 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);

46
drivers/staging/comedi/drivers/das16m1.c
View File

@ -131,23 +131,23 @@ static const comedi_lrange range_das16m1 = { 9,
} }
}; };
static int das16m1_do_wbits(comedi_device * dev, comedi_subdevice * s, static int das16m1_do_wbits(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int das16m1_di_rbits(comedi_device * dev, comedi_subdevice * s, static int das16m1_di_rbits(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int das16m1_ai_rinsn(comedi_device * dev, comedi_subdevice * s, static int das16m1_ai_rinsn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int das16m1_cmd_test(comedi_device * dev, comedi_subdevice * s, static int das16m1_cmd_test(struct comedi_device * dev, comedi_subdevice * s,
comedi_cmd * cmd); comedi_cmd * cmd);
static int das16m1_cmd_exec(comedi_device * dev, comedi_subdevice * s); static int das16m1_cmd_exec(struct comedi_device * dev, comedi_subdevice * s);
static int das16m1_cancel(comedi_device * dev, comedi_subdevice * s); static int das16m1_cancel(struct comedi_device * dev, comedi_subdevice * s);
static int das16m1_poll(comedi_device * dev, comedi_subdevice * s); static int das16m1_poll(struct comedi_device * dev, comedi_subdevice * s);
static irqreturn_t das16m1_interrupt(int irq, void *d PT_REGS_ARG); static irqreturn_t das16m1_interrupt(int irq, void *d PT_REGS_ARG);
static void das16m1_handler(comedi_device * dev, unsigned int status); static void das16m1_handler(struct comedi_device * dev, unsigned int status);
static unsigned int das16m1_set_pacer(comedi_device * dev, unsigned int ns, static unsigned int das16m1_set_pacer(struct comedi_device * dev, unsigned int ns,
int round_flag); int round_flag);
static int das16m1_irq_bits(unsigned int irq); static int das16m1_irq_bits(unsigned int irq);
@ -166,8 +166,8 @@ static const das16m1_board das16m1_boards[] = {
#define das16m1_num_boards ((sizeof(das16m1_boards)) / (sizeof(das16m1_boards[0]))) #define das16m1_num_boards ((sizeof(das16m1_boards)) / (sizeof(das16m1_boards[0])))
static int das16m1_attach(comedi_device * dev, comedi_devconfig * it); static int das16m1_attach(struct comedi_device * dev, comedi_devconfig * it);
static int das16m1_detach(comedi_device * dev); static int das16m1_detach(struct comedi_device * dev);
static comedi_driver driver_das16m1 = { static comedi_driver driver_das16m1 = {
driver_name:"das16m1", driver_name:"das16m1",
module:THIS_MODULE, module:THIS_MODULE,
@ -200,7 +200,7 @@ static inline short munge_sample(short data)
return (data >> 4) & 0xfff; return (data >> 4) & 0xfff;
} }
static int das16m1_cmd_test(comedi_device * dev, comedi_subdevice * s, static int das16m1_cmd_test(struct comedi_device * dev, comedi_subdevice * s,
comedi_cmd * cmd) comedi_cmd * cmd)
{ {
unsigned int err = 0, tmp, i; unsigned int err = 0, tmp, i;
@ -322,7 +322,7 @@ static int das16m1_cmd_test(comedi_device * dev, comedi_subdevice * s,
return 0; return 0;
} }
static int das16m1_cmd_exec(comedi_device * dev, comedi_subdevice * s) static int das16m1_cmd_exec(struct comedi_device * dev, comedi_subdevice * s)
{ {
comedi_async *async = s->async; comedi_async *async = s->async;
comedi_cmd *cmd = &async->cmd; comedi_cmd *cmd = &async->cmd;
@ -385,7 +385,7 @@ static int das16m1_cmd_exec(comedi_device * dev, comedi_subdevice * s)
return 0; return 0;
} }
static int das16m1_cancel(comedi_device * dev, comedi_subdevice * s) static int das16m1_cancel(struct comedi_device * dev, comedi_subdevice * s)
{ {
devpriv->control_state &= ~INTE & ~PACER_MASK; devpriv->control_state &= ~INTE & ~PACER_MASK;
outb(devpriv->control_state, dev->iobase + DAS16M1_INTR_CONTROL); outb(devpriv->control_state, dev->iobase + DAS16M1_INTR_CONTROL);
@ -393,7 +393,7 @@ static int das16m1_cancel(comedi_device * dev, comedi_subdevice * s)
return 0; return 0;
} }
static int das16m1_ai_rinsn(comedi_device * dev, comedi_subdevice * s, static int das16m1_ai_rinsn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
int i, n; int i, n;
@ -430,7 +430,7 @@ static int das16m1_ai_rinsn(comedi_device * dev, comedi_subdevice * s,
return n; return n;
} }
static int das16m1_di_rbits(comedi_device * dev, comedi_subdevice * s, static int das16m1_di_rbits(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
unsigned int bits; unsigned int bits;
@ -442,7 +442,7 @@ static int das16m1_di_rbits(comedi_device * dev, comedi_subdevice * s,
return 2; return 2;
} }
static int das16m1_do_wbits(comedi_device * dev, comedi_subdevice * s, static int das16m1_do_wbits(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
unsigned int wbits; unsigned int wbits;
@ -462,7 +462,7 @@ static int das16m1_do_wbits(comedi_device * dev, comedi_subdevice * s,
return 2; return 2;
} }
static int das16m1_poll(comedi_device * dev, comedi_subdevice * s) static int das16m1_poll(struct comedi_device * dev, comedi_subdevice * s)
{ {
unsigned long flags; unsigned long flags;
unsigned int status; unsigned int status;
@ -479,7 +479,7 @@ static int das16m1_poll(comedi_device * dev, comedi_subdevice * s)
static irqreturn_t das16m1_interrupt(int irq, void *d PT_REGS_ARG) static irqreturn_t das16m1_interrupt(int irq, void *d PT_REGS_ARG)
{ {
int status; int status;
comedi_device *dev = d; struct comedi_device *dev = d;
if (dev->attached == 0) { if (dev->attached == 0) {
comedi_error(dev, "premature interrupt"); comedi_error(dev, "premature interrupt");
@ -514,7 +514,7 @@ static void munge_sample_array(short * array, unsigned int num_elements)
} }
} }
static void das16m1_handler(comedi_device * dev, unsigned int status) static void das16m1_handler(struct comedi_device * dev, unsigned int status)
{ {
comedi_subdevice *s; comedi_subdevice *s;
comedi_async *async; comedi_async *async;
@ -578,7 +578,7 @@ static void das16m1_handler(comedi_device * dev, unsigned int status)
/* This function takes a time in nanoseconds and sets the * /* This function takes a time in nanoseconds and sets the *
* 2 pacer clocks to the closest frequency possible. It also * * 2 pacer clocks to the closest frequency possible. It also *
* returns the actual sampling period. */ * returns the actual sampling period. */
static unsigned int das16m1_set_pacer(comedi_device * dev, unsigned int ns, static unsigned int das16m1_set_pacer(struct comedi_device * dev, unsigned int ns,
int rounding_flags) int rounding_flags)
{ {
i8253_cascade_ns_to_timer_2div(DAS16M1_XTAL, &(devpriv->divisor1), i8253_cascade_ns_to_timer_2div(DAS16M1_XTAL, &(devpriv->divisor1),
@ -635,7 +635,7 @@ static int das16m1_irq_bits(unsigned int irq)
* 1 IRQ * 1 IRQ
*/ */
static int das16m1_attach(comedi_device * dev, comedi_devconfig * it) static int das16m1_attach(struct comedi_device * dev, comedi_devconfig * it)
{ {
comedi_subdevice *s; comedi_subdevice *s;
int ret; int ret;
@ -744,7 +744,7 @@ static int das16m1_attach(comedi_device * dev, comedi_devconfig * it)
return 0; return 0;
} }
static int das16m1_detach(comedi_device * dev) static int das16m1_detach(struct comedi_device * dev)
{ {
printk("comedi%d: das16m1: remove\n", dev->minor); printk("comedi%d: das16m1: remove\n", dev->minor);

86
drivers/staging/comedi/drivers/das1800.c
View File

@ -180,35 +180,35 @@ enum {
das1802hr, das1802hr_da, das1801hc, das1802hc, das1801ao, das1802ao das1802hr, das1802hr_da, das1801hc, das1802hc, das1801ao, das1802ao
}; };
static int das1800_attach(comedi_device * dev, comedi_devconfig * it); static int das1800_attach(struct comedi_device * dev, comedi_devconfig * it);
static int das1800_detach(comedi_device * dev); static int das1800_detach(struct comedi_device * dev);
static int das1800_probe(comedi_device * dev); static int das1800_probe(struct comedi_device * dev);
static int das1800_cancel(comedi_device * dev, comedi_subdevice * s); static int das1800_cancel(struct comedi_device * dev, comedi_subdevice * s);
static irqreturn_t das1800_interrupt(int irq, void *d PT_REGS_ARG); static irqreturn_t das1800_interrupt(int irq, void *d PT_REGS_ARG);
static int das1800_ai_poll(comedi_device * dev, comedi_subdevice * s); static int das1800_ai_poll(struct comedi_device * dev, comedi_subdevice * s);
static void das1800_ai_handler(comedi_device * dev); static void das1800_ai_handler(struct comedi_device * dev);
static void das1800_handle_dma(comedi_device * dev, comedi_subdevice * s, static void das1800_handle_dma(struct comedi_device * dev, comedi_subdevice * s,
unsigned int status); unsigned int status);
static void das1800_flush_dma(comedi_device * dev, comedi_subdevice * s); static void das1800_flush_dma(struct comedi_device * dev, comedi_subdevice * s);
static void das1800_flush_dma_channel(comedi_device * dev, comedi_subdevice * s, static void das1800_flush_dma_channel(struct comedi_device * dev, comedi_subdevice * s,
unsigned int channel, uint16_t * buffer); unsigned int channel, uint16_t * buffer);
static void das1800_handle_fifo_half_full(comedi_device * dev, static void das1800_handle_fifo_half_full(struct comedi_device * dev,
comedi_subdevice * s); comedi_subdevice * s);
static void das1800_handle_fifo_not_empty(comedi_device * dev, static void das1800_handle_fifo_not_empty(struct comedi_device * dev,
comedi_subdevice * s); comedi_subdevice * s);
static int das1800_ai_do_cmdtest(comedi_device * dev, comedi_subdevice * s, static int das1800_ai_do_cmdtest(struct comedi_device * dev, comedi_subdevice * s,
comedi_cmd * cmd); comedi_cmd * cmd);
static int das1800_ai_do_cmd(comedi_device * dev, comedi_subdevice * s); static int das1800_ai_do_cmd(struct comedi_device * dev, comedi_subdevice * s);
static int das1800_ai_rinsn(comedi_device * dev, comedi_subdevice * s, static int das1800_ai_rinsn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int das1800_ao_winsn(comedi_device * dev, comedi_subdevice * s, static int das1800_ao_winsn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int das1800_di_rbits(comedi_device * dev, comedi_subdevice * s, static int das1800_di_rbits(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int das1800_do_wbits(comedi_device * dev, comedi_subdevice * s, static int das1800_do_wbits(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int das1800_set_frequency(comedi_device * dev); static int das1800_set_frequency(struct comedi_device * dev);
static unsigned int burst_convert_arg(unsigned int convert_arg, int round_mode); static unsigned int burst_convert_arg(unsigned int convert_arg, int round_mode);
static unsigned int suggest_transfer_size(comedi_cmd * cmd); static unsigned int suggest_transfer_size(comedi_cmd * cmd);
@ -520,7 +520,7 @@ static comedi_driver driver_das1800 = {
*/ */
COMEDI_INITCLEANUP(driver_das1800); COMEDI_INITCLEANUP(driver_das1800);
static int das1800_init_dma(comedi_device * dev, unsigned int dma0, static int das1800_init_dma(struct comedi_device * dev, unsigned int dma0,
unsigned int dma1) unsigned int dma1)
{ {
unsigned long flags; unsigned long flags;
@ -590,7 +590,7 @@ static int das1800_init_dma(comedi_device * dev, unsigned int dma0,
return 0; return 0;
} }
static int das1800_attach(comedi_device * dev, comedi_devconfig * it) static int das1800_attach(struct comedi_device * dev, comedi_devconfig * it)
{ {
comedi_subdevice *s; comedi_subdevice *s;
unsigned long iobase = it->options[0]; unsigned long iobase = it->options[0];
@ -765,7 +765,7 @@ static int das1800_attach(comedi_device * dev, comedi_devconfig * it)
return 0; return 0;
}; };
static int das1800_detach(comedi_device * dev) static int das1800_detach(struct comedi_device * dev)
{ {
/* only free stuff if it has been allocated by _attach */ /* only free stuff if it has been allocated by _attach */
if (dev->iobase) if (dev->iobase)
@ -793,7 +793,7 @@ static int das1800_detach(comedi_device * dev)
/* probes and checks das-1800 series board type /* probes and checks das-1800 series board type
*/ */
static int das1800_probe(comedi_device * dev) static int das1800_probe(struct comedi_device * dev)
{ {
int id; int id;
int board; int board;
@ -867,7 +867,7 @@ static int das1800_probe(comedi_device * dev)
return -1; return -1;
} }
static int das1800_ai_poll(comedi_device * dev, comedi_subdevice * s) static int das1800_ai_poll(struct comedi_device * dev, comedi_subdevice * s)
{ {
unsigned long flags; unsigned long flags;
@ -881,7 +881,7 @@ static int das1800_ai_poll(comedi_device * dev, comedi_subdevice * s)
static irqreturn_t das1800_interrupt(int irq, void *d PT_REGS_ARG) static irqreturn_t das1800_interrupt(int irq, void *d PT_REGS_ARG)
{ {
comedi_device *dev = d; struct comedi_device *dev = d;
unsigned int status; unsigned int status;
if (dev->attached == 0) { if (dev->attached == 0) {
@ -909,7 +909,7 @@ static irqreturn_t das1800_interrupt(int irq, void *d PT_REGS_ARG)
} }
// the guts of the interrupt handler, that is shared with das1800_ai_poll // the guts of the interrupt handler, that is shared with das1800_ai_poll
static void das1800_ai_handler(comedi_device * dev) static void das1800_ai_handler(struct comedi_device * dev)
{ {
comedi_subdevice *s = dev->subdevices + 0; /* analog input subdevice */ comedi_subdevice *s = dev->subdevices + 0; /* analog input subdevice */
comedi_async *async = s->async; comedi_async *async = s->async;
@ -962,7 +962,7 @@ static void das1800_ai_handler(comedi_device * dev)
return; return;
} }
static void das1800_handle_dma(comedi_device * dev, comedi_subdevice * s, static void das1800_handle_dma(struct comedi_device * dev, comedi_subdevice * s,
unsigned int status) unsigned int status)
{ {
unsigned long flags; unsigned long flags;
@ -997,14 +997,14 @@ static void das1800_handle_dma(comedi_device * dev, comedi_subdevice * s,
return; return;
} }
static inline uint16_t munge_bipolar_sample(const comedi_device * dev, static inline uint16_t munge_bipolar_sample(const struct comedi_device * dev,
uint16_t sample) uint16_t sample)
{ {
sample += 1 << (thisboard->resolution - 1); sample += 1 << (thisboard->resolution - 1);
return sample; return sample;
} }
static void munge_data(comedi_device * dev, uint16_t * array, static void munge_data(struct comedi_device * dev, uint16_t * array,
unsigned int num_elements) unsigned int num_elements)
{ {
unsigned int i; unsigned int i;
@ -1023,7 +1023,7 @@ static void munge_data(comedi_device * dev, uint16_t * array,
/* Utility function used by das1800_flush_dma() and das1800_handle_dma(). /* Utility function used by das1800_flush_dma() and das1800_handle_dma().
* Assumes dma lock is held */ * Assumes dma lock is held */
static void das1800_flush_dma_channel(comedi_device * dev, comedi_subdevice * s, static void das1800_flush_dma_channel(struct comedi_device * dev, comedi_subdevice * s,
unsigned int channel, uint16_t * buffer) unsigned int channel, uint16_t * buffer)
{ {
unsigned int num_bytes, num_samples; unsigned int num_bytes, num_samples;
@ -1053,7 +1053,7 @@ static void das1800_flush_dma_channel(comedi_device * dev, comedi_subdevice * s,
/* flushes remaining data from board when external trigger has stopped aquisition /* flushes remaining data from board when external trigger has stopped aquisition
* and we are using dma transfers */ * and we are using dma transfers */
static void das1800_flush_dma(comedi_device * dev, comedi_subdevice * s) static void das1800_flush_dma(struct comedi_device * dev, comedi_subdevice * s)
{ {
unsigned long flags; unsigned long flags;
const int dual_dma = devpriv->irq_dma_bits & DMA_DUAL; const int dual_dma = devpriv->irq_dma_bits & DMA_DUAL;
@ -1083,7 +1083,7 @@ static void das1800_flush_dma(comedi_device * dev, comedi_subdevice * s)
return; return;
} }
static void das1800_handle_fifo_half_full(comedi_device * dev, static void das1800_handle_fifo_half_full(struct comedi_device * dev,
comedi_subdevice * s) comedi_subdevice * s)
{ {
int numPoints = 0; /* number of points to read */ int numPoints = 0; /* number of points to read */
@ -1102,7 +1102,7 @@ static void das1800_handle_fifo_half_full(comedi_device * dev,
return; return;
} }
static void das1800_handle_fifo_not_empty(comedi_device * dev, static void das1800_handle_fifo_not_empty(struct comedi_device * dev,
comedi_subdevice * s) comedi_subdevice * s)
{ {
short dpnt; short dpnt;
@ -1126,7 +1126,7 @@ static void das1800_handle_fifo_not_empty(comedi_device * dev,
return; return;
} }
static int das1800_cancel(comedi_device * dev, comedi_subdevice * s) static int das1800_cancel(struct comedi_device * dev, comedi_subdevice * s)
{ {
outb(0x0, dev->iobase + DAS1800_STATUS); /* disable conversions */ outb(0x0, dev->iobase + DAS1800_STATUS); /* disable conversions */
outb(0x0, dev->iobase + DAS1800_CONTROL_B); /* disable interrupts and dma */ outb(0x0, dev->iobase + DAS1800_CONTROL_B); /* disable interrupts and dma */
@ -1139,7 +1139,7 @@ static int das1800_cancel(comedi_device * dev, comedi_subdevice * s)
} }
/* test analog input cmd */ /* test analog input cmd */
static int das1800_ai_do_cmdtest(comedi_device * dev, comedi_subdevice * s, static int das1800_ai_do_cmdtest(struct comedi_device * dev, comedi_subdevice * s,
comedi_cmd * cmd) comedi_cmd * cmd)
{ {
int err = 0; int err = 0;
@ -1385,7 +1385,7 @@ static int control_c_bits(comedi_cmd cmd)
} }
// sets up counters // sets up counters
static int setup_counters(comedi_device * dev, comedi_cmd cmd) static int setup_counters(struct comedi_device * dev, comedi_cmd cmd)
{ {
// setup cascaded counters for conversion/scan frequency // setup cascaded counters for conversion/scan frequency
switch (cmd.scan_begin_src) { switch (cmd.scan_begin_src) {
@ -1424,7 +1424,7 @@ static int setup_counters(comedi_device * dev, comedi_cmd cmd)
} }
// sets up dma // sets up dma
static void setup_dma(comedi_device * dev, comedi_cmd cmd) static void setup_dma(struct comedi_device * dev, comedi_cmd cmd)
{ {
unsigned long lock_flags; unsigned long lock_flags;
const int dual_dma = devpriv->irq_dma_bits & DMA_DUAL; const int dual_dma = devpriv->irq_dma_bits & DMA_DUAL;
@ -1462,7 +1462,7 @@ static void setup_dma(comedi_device * dev, comedi_cmd cmd)
} }
// programs channel/gain list into card // programs channel/gain list into card
static void program_chanlist(comedi_device * dev, comedi_cmd cmd) static void program_chanlist(struct comedi_device * dev, comedi_cmd cmd)
{ {
int i, n, chan_range; int i, n, chan_range;
unsigned long irq_flags; unsigned long irq_flags;
@ -1489,7 +1489,7 @@ static void program_chanlist(comedi_device * dev, comedi_cmd cmd)
} }
// analog input do_cmd // analog input do_cmd
static int das1800_ai_do_cmd(comedi_device * dev, comedi_subdevice * s) static int das1800_ai_do_cmd(struct comedi_device * dev, comedi_subdevice * s)
{ {
int ret; int ret;
int control_a, control_c; int control_a, control_c;
@ -1552,7 +1552,7 @@ static int das1800_ai_do_cmd(comedi_device * dev, comedi_subdevice * s)
} }
/* read analog input */ /* read analog input */
static int das1800_ai_rinsn(comedi_device * dev, comedi_subdevice * s, static int das1800_ai_rinsn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
int i, n; int i, n;
@ -1612,7 +1612,7 @@ static int das1800_ai_rinsn(comedi_device * dev, comedi_subdevice * s,
} }
/* writes to an analog output channel */ /* writes to an analog output channel */
static int das1800_ao_winsn(comedi_device * dev, comedi_subdevice * s, static int das1800_ao_winsn(struct comedi_device * dev, 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);
@ -1641,7 +1641,7 @@ static int das1800_ao_winsn(comedi_device * dev, comedi_subdevice * s,
} }
/* reads from digital input channels */ /* reads from digital input channels */
static int das1800_di_rbits(comedi_device * dev, comedi_subdevice * s, static int das1800_di_rbits(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
@ -1652,7 +1652,7 @@ static int das1800_di_rbits(comedi_device * dev, comedi_subdevice * s,
} }
/* writes to digital output channels */ /* writes to digital output channels */
static int das1800_do_wbits(comedi_device * dev, comedi_subdevice * s, static int das1800_do_wbits(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
unsigned int wbits; unsigned int wbits;
@ -1672,7 +1672,7 @@ static int das1800_do_wbits(comedi_device * dev, comedi_subdevice * s,
} }
/* loads counters with divisor1, divisor2 from private structure */ /* loads counters with divisor1, divisor2 from private structure */
static int das1800_set_frequency(comedi_device * dev) static int das1800_set_frequency(struct comedi_device * dev)
{ {
int err = 0; int err = 0;

24
drivers/staging/comedi/drivers/das6402.c
View File

@ -98,8 +98,8 @@ This driver has suffered bitrot.
#define C2 0x80 #define C2 0x80
#define RWLH 0x30 #define RWLH 0x30
static int das6402_attach(comedi_device * dev, comedi_devconfig * it); static int das6402_attach(struct comedi_device * dev, comedi_devconfig * it);
static int das6402_detach(comedi_device * dev); static int das6402_detach(struct comedi_device * dev);
static comedi_driver driver_das6402 = { static comedi_driver driver_das6402 = {
driver_name:"das6402", driver_name:"das6402",
module:THIS_MODULE, module:THIS_MODULE,
@ -116,9 +116,9 @@ typedef struct {
} das6402_private; } das6402_private;
#define devpriv ((das6402_private *)dev->private) #define devpriv ((das6402_private *)dev->private)
static void das6402_ai_fifo_dregs(comedi_device * dev, comedi_subdevice * s); static void das6402_ai_fifo_dregs(struct comedi_device * dev, comedi_subdevice * s);
static void das6402_setcounter(comedi_device * dev) static void das6402_setcounter(struct comedi_device * dev)
{ {
BYTE p; BYTE p;
unsigned short ctrlwrd; unsigned short ctrlwrd;
@ -153,7 +153,7 @@ static void das6402_setcounter(comedi_device * dev)
static irqreturn_t intr_handler(int irq, void *d PT_REGS_ARG) static irqreturn_t intr_handler(int irq, void *d PT_REGS_ARG)
{ {
comedi_device *dev = d; struct comedi_device *dev = d;
comedi_subdevice *s = dev->subdevices; comedi_subdevice *s = dev->subdevices;
if (!dev->attached || devpriv->das6402_ignoreirq) { if (!dev->attached || devpriv->das6402_ignoreirq) {
@ -186,7 +186,7 @@ static irqreturn_t intr_handler(int irq, void *d PT_REGS_ARG)
} }
#if 0 #if 0
static void das6402_ai_fifo_read(comedi_device * dev, short * data, int n) static void das6402_ai_fifo_read(struct comedi_device * dev, short * data, int n)
{ {
int i; int i;
@ -195,7 +195,7 @@ static void das6402_ai_fifo_read(comedi_device * dev, short * data, int n)
} }
#endif #endif
static void das6402_ai_fifo_dregs(comedi_device * dev, comedi_subdevice * s) static void das6402_ai_fifo_dregs(struct comedi_device * dev, comedi_subdevice * s)
{ {
while (1) { while (1) {
if (!(inb(dev->iobase + 8) & 0x01)) if (!(inb(dev->iobase + 8) & 0x01))
@ -204,7 +204,7 @@ static void das6402_ai_fifo_dregs(comedi_device * dev, comedi_subdevice * s)
} }
} }
static int das6402_ai_cancel(comedi_device * dev, comedi_subdevice * s) static int das6402_ai_cancel(struct comedi_device * dev, comedi_subdevice * s)
{ {
/* /*
* This function should reset the board from whatever condition it * This function should reset the board from whatever condition it
@ -226,7 +226,7 @@ static int das6402_ai_cancel(comedi_device * dev, comedi_subdevice * s)
} }
#ifdef unused #ifdef unused
static int das6402_ai_mode2(comedi_device * dev, comedi_subdevice * s, static int das6402_ai_mode2(struct comedi_device * dev, comedi_subdevice * s,
comedi_trig * it) comedi_trig * it)
{ {
devpriv->das6402_ignoreirq = 1; devpriv->das6402_ignoreirq = 1;
@ -249,7 +249,7 @@ static int das6402_ai_mode2(comedi_device * dev, comedi_subdevice * s,
} }
#endif #endif
static int board_init(comedi_device * dev) static int board_init(struct comedi_device * dev)
{ {
BYTE b; BYTE b;
@ -289,7 +289,7 @@ static int board_init(comedi_device * dev)
return 0; return 0;
} }
static int das6402_detach(comedi_device * dev) static int das6402_detach(struct comedi_device * dev)
{ {
if (dev->irq) if (dev->irq)
comedi_free_irq(dev->irq, dev); comedi_free_irq(dev->irq, dev);
@ -299,7 +299,7 @@ static int das6402_detach(comedi_device * dev)
return 0; return 0;
} }
static int das6402_attach(comedi_device * dev, comedi_devconfig * it) static int das6402_attach(struct comedi_device * dev, comedi_devconfig * it)
{ {
unsigned int irq; unsigned int irq;
unsigned long iobase; unsigned long iobase;

50
drivers/staging/comedi/drivers/das800.c
View File

@ -242,9 +242,9 @@ typedef struct {
#define devpriv ((das800_private *)dev->private) #define devpriv ((das800_private *)dev->private)
static int das800_attach(comedi_device * dev, comedi_devconfig * it); static int das800_attach(struct comedi_device * dev, comedi_devconfig * it);
static int das800_detach(comedi_device * dev); static int das800_detach(struct comedi_device * dev);
static int das800_cancel(comedi_device * dev, comedi_subdevice * s); static int das800_cancel(struct comedi_device * dev, comedi_subdevice * s);
static comedi_driver driver_das800 = { static comedi_driver driver_das800 = {
driver_name:"das800", driver_name:"das800",
@ -257,22 +257,22 @@ static comedi_driver driver_das800 = {
}; };
static irqreturn_t das800_interrupt(int irq, void *d PT_REGS_ARG); static irqreturn_t das800_interrupt(int irq, void *d PT_REGS_ARG);
static void enable_das800(comedi_device * dev); static void enable_das800(struct comedi_device * dev);
static void disable_das800(comedi_device * dev); static void disable_das800(struct comedi_device * dev);
static int das800_ai_do_cmdtest(comedi_device * dev, comedi_subdevice * s, static int das800_ai_do_cmdtest(struct comedi_device * dev, comedi_subdevice * s,
comedi_cmd * cmd); comedi_cmd * cmd);
static int das800_ai_do_cmd(comedi_device * dev, comedi_subdevice * s); static int das800_ai_do_cmd(struct comedi_device * dev, comedi_subdevice * s);
static int das800_ai_rinsn(comedi_device * dev, comedi_subdevice * s, static int das800_ai_rinsn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int das800_di_rbits(comedi_device * dev, comedi_subdevice * s, static int das800_di_rbits(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int das800_do_wbits(comedi_device * dev, comedi_subdevice * s, static int das800_do_wbits(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int das800_probe(comedi_device * dev); static int das800_probe(struct comedi_device * dev);
static int das800_set_frequency(comedi_device * dev); static int das800_set_frequency(struct comedi_device * dev);
/* checks and probes das-800 series board type */ /* checks and probes das-800 series board type */
static int das800_probe(comedi_device * dev) static int das800_probe(struct comedi_device * dev)
{ {
int id_bits; int id_bits;
unsigned long irq_flags; unsigned long irq_flags;
@ -347,7 +347,7 @@ static irqreturn_t das800_interrupt(int irq, void *d PT_REGS_ARG)
{ {
short i; /* loop index */ short i; /* loop index */
short dataPoint = 0; short dataPoint = 0;
comedi_device *dev = d; struct comedi_device *dev = d;
comedi_subdevice *s = dev->read_subdev; /* analog input subdevice */ comedi_subdevice *s = dev->read_subdev; /* analog input subdevice */
comedi_async *async; comedi_async *async;
int status; int status;
@ -441,7 +441,7 @@ static irqreturn_t das800_interrupt(int irq, void *d PT_REGS_ARG)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static int das800_attach(comedi_device * dev, comedi_devconfig * it) static int das800_attach(struct comedi_device * dev, comedi_devconfig * it)
{ {
comedi_subdevice *s; comedi_subdevice *s;
unsigned long iobase = it->options[0]; unsigned long iobase = it->options[0];
@ -539,7 +539,7 @@ static int das800_attach(comedi_device * dev, comedi_devconfig * it)
return 0; return 0;
}; };
static int das800_detach(comedi_device * dev) static int das800_detach(struct comedi_device * dev)
{ {
printk("comedi%d: das800: remove\n", dev->minor); printk("comedi%d: das800: remove\n", dev->minor);
@ -551,7 +551,7 @@ static int das800_detach(comedi_device * dev)
return 0; return 0;
}; };
static int das800_cancel(comedi_device * dev, comedi_subdevice * s) static int das800_cancel(struct comedi_device * dev, comedi_subdevice * s)
{ {
devpriv->forever = 0; devpriv->forever = 0;
devpriv->count = 0; devpriv->count = 0;
@ -560,7 +560,7 @@ static int das800_cancel(comedi_device * dev, comedi_subdevice * s)
} }
/* enable_das800 makes the card start taking hardware triggered conversions */ /* enable_das800 makes the card start taking hardware triggered conversions */
static void enable_das800(comedi_device * dev) static void enable_das800(struct comedi_device * dev)
{ {
unsigned long irq_flags; unsigned long irq_flags;
comedi_spin_lock_irqsave(&dev->spinlock, irq_flags); comedi_spin_lock_irqsave(&dev->spinlock, irq_flags);
@ -575,7 +575,7 @@ static void enable_das800(comedi_device * dev)
} }
/* disable_das800 stops hardware triggered conversions */ /* disable_das800 stops hardware triggered conversions */
static void disable_das800(comedi_device * dev) static void disable_das800(struct comedi_device * dev)
{ {
unsigned long irq_flags; unsigned long irq_flags;
comedi_spin_lock_irqsave(&dev->spinlock, irq_flags); comedi_spin_lock_irqsave(&dev->spinlock, irq_flags);
@ -584,7 +584,7 @@ static void disable_das800(comedi_device * dev)
comedi_spin_unlock_irqrestore(&dev->spinlock, irq_flags); comedi_spin_unlock_irqrestore(&dev->spinlock, irq_flags);
} }
static int das800_ai_do_cmdtest(comedi_device * dev, comedi_subdevice * s, static int das800_ai_do_cmdtest(struct comedi_device * dev, comedi_subdevice * s,
comedi_cmd * cmd) comedi_cmd * cmd)
{ {
int err = 0; int err = 0;
@ -709,7 +709,7 @@ static int das800_ai_do_cmdtest(comedi_device * dev, comedi_subdevice * s,
return 0; return 0;
} }
static int das800_ai_do_cmd(comedi_device * dev, comedi_subdevice * s) static int das800_ai_do_cmd(struct comedi_device * dev, comedi_subdevice * s)
{ {
int startChan, endChan, scan, gain; int startChan, endChan, scan, gain;
int conv_bits; int conv_bits;
@ -788,7 +788,7 @@ static int das800_ai_do_cmd(comedi_device * dev, comedi_subdevice * s)
return 0; return 0;
} }
static int das800_ai_rinsn(comedi_device * dev, comedi_subdevice * s, static int das800_ai_rinsn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
int i, n; int i, n;
@ -842,7 +842,7 @@ static int das800_ai_rinsn(comedi_device * dev, comedi_subdevice * s,
return n; return n;
} }
static int das800_di_rbits(comedi_device * dev, comedi_subdevice * s, static int das800_di_rbits(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
unsigned int bits; unsigned int bits;
@ -855,7 +855,7 @@ static int das800_di_rbits(comedi_device * dev, comedi_subdevice * s,
return 2; return 2;
} }
static int das800_do_wbits(comedi_device * dev, comedi_subdevice * s, static int das800_do_wbits(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
int wbits; int wbits;
@ -879,7 +879,7 @@ static int das800_do_wbits(comedi_device * dev, comedi_subdevice * s,
} }
/* loads counters with divisor1, divisor2 from private structure */ /* loads counters with divisor1, divisor2 from private structure */
static int das800_set_frequency(comedi_device * dev) static int das800_set_frequency(struct comedi_device * dev)
{ {
int err = 0; int err = 0;

48
drivers/staging/comedi/drivers/dmm32at.c
View File

@ -232,7 +232,7 @@ static const dmm32at_board dmm32at_boards[] = {
/* this structure is for data unique to this hardware driver. If /* this structure is for data unique to this hardware driver. If
* several hardware drivers keep similar information in this structure, * several hardware drivers keep similar information in this structure,
* feel free to suggest moving the variable to the comedi_device struct. * feel free to suggest moving the variable to the struct comedi_device struct.
*/ */
typedef struct { typedef struct {
@ -258,8 +258,8 @@ typedef struct {
* the board, and also about the kernel module that contains * the board, and also about the kernel module that contains
* the device code. * the device code.
*/ */
static int dmm32at_attach(comedi_device * dev, comedi_devconfig * it); static int dmm32at_attach(struct comedi_device * dev, comedi_devconfig * it);
static int dmm32at_detach(comedi_device * dev); static int dmm32at_detach(struct comedi_device * dev);
static comedi_driver driver_dmm32at = { static comedi_driver driver_dmm32at = {
driver_name:"dmm32at", driver_name:"dmm32at",
module:THIS_MODULE, module:THIS_MODULE,
@ -289,23 +289,23 @@ static comedi_driver driver_dmm32at = {
}; };
/* prototypes for driver functions below */ /* prototypes for driver functions below */
static int dmm32at_ai_rinsn(comedi_device * dev, comedi_subdevice * s, static int dmm32at_ai_rinsn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int dmm32at_ao_winsn(comedi_device * dev, comedi_subdevice * s, static int dmm32at_ao_winsn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int dmm32at_ao_rinsn(comedi_device * dev, comedi_subdevice * s, static int dmm32at_ao_rinsn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int dmm32at_dio_insn_bits(comedi_device * dev, comedi_subdevice * s, static int dmm32at_dio_insn_bits(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int dmm32at_dio_insn_config(comedi_device * dev, comedi_subdevice * s, static int dmm32at_dio_insn_config(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int dmm32at_ai_cmdtest(comedi_device * dev, comedi_subdevice * s, static int dmm32at_ai_cmdtest(struct comedi_device * dev, comedi_subdevice * s,
comedi_cmd * cmd); comedi_cmd * cmd);
static int dmm32at_ai_cmd(comedi_device * dev, comedi_subdevice * s); static int dmm32at_ai_cmd(struct comedi_device * dev, comedi_subdevice * s);
static int dmm32at_ai_cancel(comedi_device * dev, comedi_subdevice * s); static int dmm32at_ai_cancel(struct comedi_device * dev, comedi_subdevice * s);
static int dmm32at_ns_to_timer(unsigned int *ns, int round); static int dmm32at_ns_to_timer(unsigned int *ns, int round);
static irqreturn_t dmm32at_isr(int irq, void *d PT_REGS_ARG); static irqreturn_t dmm32at_isr(int irq, void *d PT_REGS_ARG);
void dmm32at_setaitimer(comedi_device * dev, unsigned int nansec); void dmm32at_setaitimer(struct comedi_device * dev, unsigned int nansec);
/* /*
* Attach is called by the Comedi core to configure the driver * Attach is called by the Comedi core to configure the driver
@ -313,7 +313,7 @@ void dmm32at_setaitimer(comedi_device * dev, unsigned int nansec);
* in the driver structure, dev->board_ptr contains that * in the driver structure, dev->board_ptr contains that
* address. * address.
*/ */
static int dmm32at_attach(comedi_device * dev, comedi_devconfig * it) static int dmm32at_attach(struct comedi_device * dev, comedi_devconfig * it)
{ {
int ret; int ret;
comedi_subdevice *s; comedi_subdevice *s;
@ -481,7 +481,7 @@ static int dmm32at_attach(comedi_device * dev, comedi_devconfig * it)
* allocated by _attach(). dev->private and dev->subdevices are * allocated by _attach(). dev->private and dev->subdevices are
* deallocated automatically by the core. * deallocated automatically by the core.
*/ */
static int dmm32at_detach(comedi_device * dev) static int dmm32at_detach(struct comedi_device * dev)
{ {
printk("comedi%d: dmm32at: remove\n", dev->minor); printk("comedi%d: dmm32at: remove\n", dev->minor);
if (dev->irq) if (dev->irq)
@ -497,7 +497,7 @@ static int dmm32at_detach(comedi_device * dev)
* mode. * mode.
*/ */
static int dmm32at_ai_rinsn(comedi_device * dev, comedi_subdevice * s, static int dmm32at_ai_rinsn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
int n, i; int n, i;
@ -568,7 +568,7 @@ static int dmm32at_ai_rinsn(comedi_device * dev, comedi_subdevice * s,
return n; return n;
} }
static int dmm32at_ai_cmdtest(comedi_device * dev, comedi_subdevice * s, static int dmm32at_ai_cmdtest(struct comedi_device * dev, comedi_subdevice * s,
comedi_cmd * cmd) comedi_cmd * cmd)
{ {
int err = 0; int err = 0;
@ -752,7 +752,7 @@ static int dmm32at_ai_cmdtest(comedi_device * dev, comedi_subdevice * s,
return 0; return 0;
} }
static int dmm32at_ai_cmd(comedi_device * dev, comedi_subdevice * s) static int dmm32at_ai_cmd(struct comedi_device * dev, comedi_subdevice * s)
{ {
comedi_cmd *cmd = &s->async->cmd; comedi_cmd *cmd = &s->async->cmd;
int i, range; int i, range;
@ -822,7 +822,7 @@ static int dmm32at_ai_cmd(comedi_device * dev, comedi_subdevice * s)
} }
static int dmm32at_ai_cancel(comedi_device * dev, comedi_subdevice * s) static int dmm32at_ai_cancel(struct comedi_device * dev, comedi_subdevice * s)
{ {
devpriv->ai_scans_left = 1; devpriv->ai_scans_left = 1;
return 0; return 0;
@ -834,7 +834,7 @@ static irqreturn_t dmm32at_isr(int irq, void *d PT_REGS_ARG)
unsigned int samp; unsigned int samp;
unsigned short msb, lsb; unsigned short msb, lsb;
int i; int i;
comedi_device *dev = d; struct comedi_device *dev = d;
if (!dev->attached) { if (!dev->attached) {
comedi_error(dev, "spurious interrupt"); comedi_error(dev, "spurious interrupt");
@ -893,7 +893,7 @@ static int dmm32at_ns_to_timer(unsigned int *ns, int round)
return *ns; return *ns;
} }
static int dmm32at_ao_winsn(comedi_device * dev, comedi_subdevice * s, static int dmm32at_ao_winsn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
int i; int i;
@ -936,7 +936,7 @@ static int dmm32at_ao_winsn(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 dmm32at_ao_rinsn(comedi_device * dev, comedi_subdevice * s, static int dmm32at_ao_rinsn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
int i; int i;
@ -953,7 +953,7 @@ static int dmm32at_ao_rinsn(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 dmm32at_dio_insn_bits(comedi_device * dev, comedi_subdevice * s, static int dmm32at_dio_insn_bits(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
unsigned char diobits; unsigned char diobits;
@ -1006,7 +1006,7 @@ static int dmm32at_dio_insn_bits(comedi_device * dev, comedi_subdevice * s,
return 2; return 2;
} }
static int dmm32at_dio_insn_config(comedi_device * dev, comedi_subdevice * s, static int dmm32at_dio_insn_config(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
unsigned char chanbit; unsigned char chanbit;
@ -1043,7 +1043,7 @@ static int dmm32at_dio_insn_config(comedi_device * dev, comedi_subdevice * s,
return 1; return 1;
} }
void dmm32at_setaitimer(comedi_device * dev, unsigned int nansec) void dmm32at_setaitimer(struct comedi_device * dev, unsigned int nansec)
{ {
unsigned char lo1, lo2, hi2; unsigned char lo1, lo2, hi2;
unsigned short both2; unsigned short both2;

46
drivers/staging/comedi/drivers/dt2801.c
View File

@ -88,8 +88,8 @@ Configuration options:
#define DT2801_STATUS 1 #define DT2801_STATUS 1
#define DT2801_CMD 1 #define DT2801_CMD 1
static int dt2801_attach(comedi_device * dev, comedi_devconfig * it); static int dt2801_attach(struct comedi_device * dev, comedi_devconfig * it);
static int dt2801_detach(comedi_device * dev); static int dt2801_detach(struct comedi_device * dev);
static comedi_driver driver_dt2801 = { static comedi_driver driver_dt2801 = {
driver_name:"dt2801", driver_name:"dt2801",
module:THIS_MODULE, module:THIS_MODULE,
@ -224,15 +224,15 @@ typedef struct {
} dt2801_private; } dt2801_private;
#define devpriv ((dt2801_private *)dev->private) #define devpriv ((dt2801_private *)dev->private)
static int dt2801_ai_insn_read(comedi_device * dev, comedi_subdevice * s, static int dt2801_ai_insn_read(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int dt2801_ao_insn_read(comedi_device * dev, comedi_subdevice * s, static int dt2801_ao_insn_read(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int dt2801_ao_insn_write(comedi_device * dev, comedi_subdevice * s, static int dt2801_ao_insn_write(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int dt2801_dio_insn_bits(comedi_device * dev, comedi_subdevice * s, static int dt2801_dio_insn_bits(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int dt2801_dio_insn_config(comedi_device * dev, comedi_subdevice * s, static int dt2801_dio_insn_config(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
/* These are the low-level routines: /* These are the low-level routines:
@ -244,7 +244,7 @@ static int dt2801_dio_insn_config(comedi_device * dev, comedi_subdevice * s,
/* Only checks DataOutReady-flag, not the Ready-flag as it is done /* Only checks DataOutReady-flag, not the Ready-flag as it is done
in the examples of the manual. I don't see why this should be in the examples of the manual. I don't see why this should be
necessary. */ necessary. */
static int dt2801_readdata(comedi_device * dev, int *data) static int dt2801_readdata(struct comedi_device * dev, int *data)
{ {
int stat = 0; int stat = 0;
int timeout = DT2801_TIMEOUT; int timeout = DT2801_TIMEOUT;
@ -263,7 +263,7 @@ static int dt2801_readdata(comedi_device * dev, int *data)
return -ETIME; return -ETIME;
} }
static int dt2801_readdata2(comedi_device * dev, int *data) static int dt2801_readdata2(struct comedi_device * dev, int *data)
{ {
int lb, hb; int lb, hb;
int ret; int ret;
@ -279,7 +279,7 @@ static int dt2801_readdata2(comedi_device * dev, int *data)
return 0; return 0;
} }
static int dt2801_writedata(comedi_device * dev, unsigned int data) static int dt2801_writedata(struct comedi_device * dev, unsigned int data)
{ {
int stat = 0; int stat = 0;
int timeout = DT2801_TIMEOUT; int timeout = DT2801_TIMEOUT;
@ -305,7 +305,7 @@ static int dt2801_writedata(comedi_device * dev, unsigned int data)
return -ETIME; return -ETIME;
} }
static int dt2801_writedata2(comedi_device * dev, unsigned int data) static int dt2801_writedata2(struct comedi_device * dev, unsigned int data)
{ {
int ret; int ret;
@ -319,7 +319,7 @@ static int dt2801_writedata2(comedi_device * dev, unsigned int data)
return 0; return 0;
} }
static int dt2801_wait_for_ready(comedi_device * dev) static int dt2801_wait_for_ready(struct comedi_device * dev)
{ {
int timeout = DT2801_TIMEOUT; int timeout = DT2801_TIMEOUT;
int stat; int stat;
@ -342,7 +342,7 @@ static int dt2801_wait_for_ready(comedi_device * dev)
return -ETIME; return -ETIME;
} }
static int dt2801_writecmd(comedi_device * dev, int command) static int dt2801_writecmd(struct comedi_device * dev, int command)
{ {
int stat; int stat;
@ -360,7 +360,7 @@ static int dt2801_writecmd(comedi_device * dev, int command)
return 0; return 0;
} }
static int dt2801_reset(comedi_device * dev) static int dt2801_reset(struct comedi_device * dev)
{ {
int board_code = 0; int board_code = 0;
unsigned int stat; unsigned int stat;
@ -417,7 +417,7 @@ static int dt2801_reset(comedi_device * dev)
return board_code; return board_code;
} }
static int probe_number_of_ai_chans(comedi_device * dev) static int probe_number_of_ai_chans(struct comedi_device * dev)
{ {
int n_chans; int n_chans;
int stat; int stat;
@ -478,7 +478,7 @@ static const comedi_lrange *ai_range_lkup(int type, int opt)
[4] - dac0 range 0=[-10,10], 1=[-5,5], 2=[-2.5,2.5] 3=[0,10], 4=[0,5] [4] - dac0 range 0=[-10,10], 1=[-5,5], 2=[-2.5,2.5] 3=[0,10], 4=[0,5]
[5] - dac1 range 0=[-10,10], 1=[-5,5], 2=[-2.5,2.5] 3=[0,10], 4=[0,5] [5] - dac1 range 0=[-10,10], 1=[-5,5], 2=[-2.5,2.5] 3=[0,10], 4=[0,5]
*/ */
static int dt2801_attach(comedi_device * dev, comedi_devconfig * it) static int dt2801_attach(struct comedi_device * dev, comedi_devconfig * it)
{ {
comedi_subdevice *s; comedi_subdevice *s;
unsigned long iobase; unsigned long iobase;
@ -579,7 +579,7 @@ static int dt2801_attach(comedi_device * dev, comedi_devconfig * it)
return ret; return ret;
} }
static int dt2801_detach(comedi_device * dev) static int dt2801_detach(struct comedi_device * dev)
{ {
if (dev->iobase) if (dev->iobase)
release_region(dev->iobase, DT2801_IOSIZE); release_region(dev->iobase, DT2801_IOSIZE);
@ -587,7 +587,7 @@ static int dt2801_detach(comedi_device * dev)
return 0; return 0;
} }
static int dt2801_error(comedi_device * dev, int stat) static int dt2801_error(struct comedi_device * dev, int stat)
{ {
if (stat < 0) { if (stat < 0) {
if (stat == -ETIME) { if (stat == -ETIME) {
@ -605,7 +605,7 @@ static int dt2801_error(comedi_device * dev, int stat)
return -EIO; return -EIO;
} }
static int dt2801_ai_insn_read(comedi_device * dev, comedi_subdevice * s, static int dt2801_ai_insn_read(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
int d; int d;
@ -627,7 +627,7 @@ static int dt2801_ai_insn_read(comedi_device * dev, comedi_subdevice * s,
return i; return i;
} }
static int dt2801_ao_insn_read(comedi_device * dev, comedi_subdevice * s, static int dt2801_ao_insn_read(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
data[0] = devpriv->ao_readback[CR_CHAN(insn->chanspec)]; data[0] = devpriv->ao_readback[CR_CHAN(insn->chanspec)];
@ -635,7 +635,7 @@ static int dt2801_ao_insn_read(comedi_device * dev, comedi_subdevice * s,
return 1; return 1;
} }
static int dt2801_ao_insn_write(comedi_device * dev, comedi_subdevice * s, static int dt2801_ao_insn_write(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
dt2801_writecmd(dev, DT_C_WRITE_DAIM); dt2801_writecmd(dev, DT_C_WRITE_DAIM);
@ -647,7 +647,7 @@ static int dt2801_ao_insn_write(comedi_device * dev, comedi_subdevice * s,
return 1; return 1;
} }
static int dt2801_dio_insn_bits(comedi_device * dev, comedi_subdevice * s, static int dt2801_dio_insn_bits(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
int which = 0; int which = 0;
@ -671,7 +671,7 @@ static int dt2801_dio_insn_bits(comedi_device * dev, comedi_subdevice * s,
return 2; return 2;
} }
static int dt2801_dio_insn_config(comedi_device * dev, comedi_subdevice * s, static int dt2801_dio_insn_config(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
int which = 0; int which = 0;

32
drivers/staging/comedi/drivers/dt2811.c
View File

@ -212,8 +212,8 @@ static const boardtype boardtypes[] = {
#define this_board ((const boardtype *)dev->board_ptr) #define this_board ((const boardtype *)dev->board_ptr)
static int dt2811_attach(comedi_device * dev, comedi_devconfig * it); static int dt2811_attach(struct comedi_device * dev, comedi_devconfig * it);
static int dt2811_detach(comedi_device * dev); static int dt2811_detach(struct comedi_device * dev);
static comedi_driver driver_dt2811 = { static comedi_driver driver_dt2811 = {
driver_name:"dt2811", driver_name:"dt2811",
module:THIS_MODULE, module:THIS_MODULE,
@ -226,15 +226,15 @@ static comedi_driver driver_dt2811 = {
COMEDI_INITCLEANUP(driver_dt2811); COMEDI_INITCLEANUP(driver_dt2811);
static int dt2811_ai_insn(comedi_device * dev, comedi_subdevice * s, static int dt2811_ai_insn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int dt2811_ao_insn(comedi_device * dev, comedi_subdevice * s, static int dt2811_ao_insn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int dt2811_ao_insn_read(comedi_device * dev, comedi_subdevice * s, static int dt2811_ao_insn_read(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int dt2811_di_insn_bits(comedi_device * dev, comedi_subdevice * s, static int dt2811_di_insn_bits(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
static int dt2811_do_insn_bits(comedi_device * dev, comedi_subdevice * s, static int dt2811_do_insn_bits(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data); comedi_insn * insn, unsigned int * data);
enum { card_2811_pgh, card_2811_pgl }; enum { card_2811_pgh, card_2811_pgl };
@ -266,7 +266,7 @@ static irqreturn_t dt2811_interrupt(int irq, void *d PT_REGS_ARG)
{ {
int lo, hi; int lo, hi;
int data; int data;
comedi_device *dev = d; struct comedi_device *dev = d;
if (!dev->attached) { if (!dev->attached) {
comedi_error(dev, "spurious interrupt"); comedi_error(dev, "spurious interrupt");
@ -308,7 +308,7 @@ static irqreturn_t dt2811_interrupt(int irq, void *d PT_REGS_ARG)
2 == unipolar 5V (0V -- +5V) 2 == unipolar 5V (0V -- +5V)
*/ */
static int dt2811_attach(comedi_device * dev, comedi_devconfig * it) static int dt2811_attach(struct comedi_device * dev, comedi_devconfig * it)
{ {
//int i, irq; //int i, irq;
//unsigned long irqs; //unsigned long irqs;
@ -476,7 +476,7 @@ static int dt2811_attach(comedi_device * dev, comedi_devconfig * it)
return 0; return 0;
} }
static int dt2811_detach(comedi_device * dev) static int dt2811_detach(struct comedi_device * dev)
{ {
printk("comedi%d: dt2811: remove\n", dev->minor); printk("comedi%d: dt2811: remove\n", dev->minor);
@ -490,7 +490,7 @@ static int dt2811_detach(comedi_device * dev)
return 0; return 0;
} }
static int dt2811_ai_insn(comedi_device * dev, comedi_subdevice * s, static int dt2811_ai_insn(struct comedi_device * dev, 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);
@ -519,7 +519,7 @@ static int dt2811_ai_insn(comedi_device * dev, comedi_subdevice * s,
* replaced, so I'll let it stay. */ * replaced, so I'll let it stay. */
int dt2811_adtrig(kdev_t minor, comedi_adtrig * adtrig) int dt2811_adtrig(kdev_t minor, comedi_adtrig * adtrig)
{ {
comedi_device *dev = comedi_devices + minor; struct comedi_device *dev = comedi_devices + minor;
if (adtrig->n < 1) if (adtrig->n < 1)
return 0; return 0;
@ -541,7 +541,7 @@ int dt2811_adtrig(kdev_t minor, comedi_adtrig * adtrig)
} }
#endif #endif
static int dt2811_ao_insn(comedi_device * dev, comedi_subdevice * s, static int dt2811_ao_insn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
int i; int i;
@ -559,7 +559,7 @@ static int dt2811_ao_insn(comedi_device * dev, comedi_subdevice * s,
return i; return i;
} }
static int dt2811_ao_insn_read(comedi_device * dev, comedi_subdevice * s, static int dt2811_ao_insn_read(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
int i; int i;
@ -574,7 +574,7 @@ static int dt2811_ao_insn_read(comedi_device * dev, comedi_subdevice * s,
return i; return i;
} }
static int dt2811_di_insn_bits(comedi_device * dev, comedi_subdevice * s, static int dt2811_di_insn_bits(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
if (insn->n != 2) if (insn->n != 2)
@ -585,7 +585,7 @@ static int dt2811_di_insn_bits(comedi_device * dev, comedi_subdevice * s,
return 2; return 2;
} }
static int dt2811_do_insn_bits(comedi_device * dev, comedi_subdevice * s, static int dt2811_do_insn_bits(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
if (insn->n != 2) if (insn->n != 2)

16
drivers/staging/comedi/drivers/dt2814.c
View File

@ -59,8 +59,8 @@ addition, the clock does not seem to be very accurate.
#define DT2814_ENB 0x10 #define DT2814_ENB 0x10
#define DT2814_CHANMASK 0x0f #define DT2814_CHANMASK 0x0f
static int dt2814_attach(comedi_device * dev, comedi_devconfig * it); static int dt2814_attach(struct comedi_device * dev, comedi_devconfig * it);
static int dt2814_detach(comedi_device * dev); static int dt2814_detach(struct comedi_device * dev);
static comedi_driver driver_dt2814 = { static comedi_driver driver_dt2814 = {
driver_name:"dt2814", driver_name:"dt2814",
module:THIS_MODULE, module:THIS_MODULE,
@ -81,7 +81,7 @@ typedef struct {
#define DT2814_TIMEOUT 10 #define DT2814_TIMEOUT 10
#define DT2814_MAX_SPEED 100000 /* Arbitrary 10 khz limit */ #define DT2814_MAX_SPEED 100000 /* Arbitrary 10 khz limit */
static int dt2814_ai_insn_read(comedi_device * dev, comedi_subdevice * s, static int dt2814_ai_insn_read(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
int n, i, hi, lo; int n, i, hi, lo;
@ -132,7 +132,7 @@ static int dt2814_ns_to_timer(unsigned int *ns, unsigned int flags)
return i; return i;
} }
static int dt2814_ai_cmdtest(comedi_device * dev, comedi_subdevice * s, static int dt2814_ai_cmdtest(struct comedi_device * dev, comedi_subdevice * s,
comedi_cmd * cmd) comedi_cmd * cmd)
{ {
int err = 0; int err = 0;
@ -224,7 +224,7 @@ static int dt2814_ai_cmdtest(comedi_device * dev, comedi_subdevice * s,
return 0; return 0;
} }
static int dt2814_ai_cmd(comedi_device * dev, comedi_subdevice * s) static int dt2814_ai_cmd(struct comedi_device * dev, comedi_subdevice * s)
{ {
comedi_cmd *cmd = &s->async->cmd; comedi_cmd *cmd = &s->async->cmd;
int chan; int chan;
@ -243,7 +243,7 @@ static int dt2814_ai_cmd(comedi_device * dev, comedi_subdevice * s)
} }
static int dt2814_attach(comedi_device * dev, comedi_devconfig * it) static int dt2814_attach(struct comedi_device * dev, comedi_devconfig * it)
{ {
int i, irq; int i, irq;
int ret; int ret;
@ -327,7 +327,7 @@ static int dt2814_attach(comedi_device * dev, comedi_devconfig * it)
return 0; return 0;
} }
static int dt2814_detach(comedi_device * dev) static int dt2814_detach(struct comedi_device * dev)
{ {
printk("comedi%d: dt2814: remove\n", dev->minor); printk("comedi%d: dt2814: remove\n", dev->minor);
@ -344,7 +344,7 @@ static int dt2814_detach(comedi_device * dev)
static irqreturn_t dt2814_interrupt(int irq, void *d PT_REGS_ARG) static irqreturn_t dt2814_interrupt(int irq, void *d PT_REGS_ARG)
{ {
int lo, hi; int lo, hi;
comedi_device *dev = d; struct comedi_device *dev = d;
comedi_subdevice *s; comedi_subdevice *s;
int data; int data;

18
drivers/staging/comedi/drivers/dt2815.c
View File

@ -75,8 +75,8 @@ static const comedi_lrange range_dt2815_ao_20_current = { 1, {
#define DT2815_DATA 0 #define DT2815_DATA 0
#define DT2815_STATUS 1 #define DT2815_STATUS 1
static int dt2815_attach(comedi_device * dev, comedi_devconfig * it); static int dt2815_attach(struct comedi_device * dev, comedi_devconfig * it);
static int dt2815_detach(comedi_device * dev); static int dt2815_detach(struct comedi_device * dev);
static comedi_driver driver_dt2815 = { static comedi_driver driver_dt2815 = {
driver_name:"dt2815", driver_name:"dt2815",
module:THIS_MODULE, module:THIS_MODULE,
@ -86,7 +86,7 @@ static comedi_driver driver_dt2815 = {
COMEDI_INITCLEANUP(driver_dt2815); COMEDI_INITCLEANUP(driver_dt2815);
static void dt2815_free_resources(comedi_device * dev); static void dt2815_free_resources(struct comedi_device * dev);
typedef struct { typedef struct {
const comedi_lrange *range_type_list[8]; const comedi_lrange *range_type_list[8];
@ -95,7 +95,7 @@ typedef struct {
#define devpriv ((dt2815_private *)dev->private) #define devpriv ((dt2815_private *)dev->private)
static int dt2815_wait_for_status(comedi_device * dev, int status) static int dt2815_wait_for_status(struct comedi_device * dev, int status)
{ {
int i; int i;
@ -106,7 +106,7 @@ static int dt2815_wait_for_status(comedi_device * dev, int status)
return status; return status;
} }
static int dt2815_ao_insn_read(comedi_device * dev, comedi_subdevice * s, static int dt2815_ao_insn_read(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
int i; int i;
@ -119,7 +119,7 @@ static int dt2815_ao_insn_read(comedi_device * dev, comedi_subdevice * s,
return i; return i;
} }
static int dt2815_ao_insn(comedi_device * dev, comedi_subdevice * s, static int dt2815_ao_insn(struct comedi_device * dev, comedi_subdevice * s,
comedi_insn * insn, unsigned int * data) comedi_insn * insn, unsigned int * data)
{ {
int i; int i;
@ -177,7 +177,7 @@ static int dt2815_ao_insn(comedi_device * dev, comedi_subdevice * s,
1 == current 1 == current
*/ */
static int dt2815_attach(comedi_device * dev, comedi_devconfig * it) static int dt2815_attach(struct comedi_device * dev, comedi_devconfig * it)
{ {
comedi_subdevice *s; comedi_subdevice *s;
int i; int i;
@ -246,13 +246,13 @@ static int dt2815_attach(comedi_device * dev, comedi_devconfig * it)
return 0; return 0;
} }
static void dt2815_free_resources(comedi_device * dev) static void dt2815_free_resources(struct comedi_device * dev)
{ {
if (dev->iobase) if (dev->iobase)
release_region(dev->iobase, DT2815_SIZE); release_region(dev->iobase, DT2815_SIZE);
} }
static int dt2815_detach(comedi_device * dev) static int dt2815_detach(struct comedi_device * dev)
{ {
printk("comedi%d: dt2815: remove\n", dev->minor); printk("comedi%d: dt2815: remove\n", dev->minor);

Some files were not shown because too many files have changed in this diff Show More