Commit 71b5f4f1 authored by Bill Pemberton's avatar Bill Pemberton Committed by Greg Kroah-Hartman

Staging: comedi: Remove comedi_device typedef

Signed-off-by: default avatarBill Pemberton <wfp5p@virginia.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 790c5541
This diff is collapsed.
......@@ -58,12 +58,12 @@
int comedi_request_irq(unsigned int irq, irqreturn_t(*handler) (int,
void *PT_REGS_ARG), unsigned long flags, const char *device,
comedi_device *dev_id);
void comedi_free_irq(unsigned int irq, comedi_device *dev_id);
struct comedi_device *dev_id);
void comedi_free_irq(unsigned int irq, struct comedi_device *dev_id);
void comedi_rt_init(void);
void comedi_rt_cleanup(void);
int comedi_switch_to_rt(comedi_device *dev);
void comedi_switch_to_non_rt(comedi_device *dev);
int comedi_switch_to_rt(struct comedi_device *dev);
void comedi_switch_to_non_rt(struct comedi_device *dev);
void comedi_rt_pend_wakeup(wait_queue_head_t *q);
extern int rt_pend_call(void (*func) (int arg1, void *arg2), int arg1,
void *arg2);
......
......@@ -121,7 +121,6 @@
#define COMEDI_NUM_BOARD_MINORS 0x30
#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_async_struct comedi_async;
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)
struct comedi_subdevice_struct {
comedi_device *device;
struct comedi_device *device;
int type;
int n_chan;
volatile int subdev_flags;
......@@ -163,27 +162,27 @@ struct comedi_subdevice_struct {
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 *);
int (*insn_write) (comedi_device *, comedi_subdevice *, comedi_insn *,
int (*insn_write) (struct comedi_device *, comedi_subdevice *, comedi_insn *,
unsigned int *);
int (*insn_bits) (comedi_device *, comedi_subdevice *, comedi_insn *,
int (*insn_bits) (struct comedi_device *, comedi_subdevice *, comedi_insn *,
unsigned int *);
int (*insn_config) (comedi_device *, comedi_subdevice *, comedi_insn *,
int (*insn_config) (struct comedi_device *, comedi_subdevice *, comedi_insn *,
unsigned int *);
int (*do_cmd) (comedi_device *, comedi_subdevice *);
int (*do_cmdtest) (comedi_device *, comedi_subdevice *, comedi_cmd *);
int (*poll) (comedi_device *, comedi_subdevice *);
int (*cancel) (comedi_device *, comedi_subdevice *);
/* int (*do_lock)(comedi_device *,comedi_subdevice *); */
/* int (*do_unlock)(comedi_device *,comedi_subdevice *); */
int (*do_cmd) (struct comedi_device *, comedi_subdevice *);
int (*do_cmdtest) (struct comedi_device *, comedi_subdevice *, comedi_cmd *);
int (*poll) (struct comedi_device *, comedi_subdevice *);
int (*cancel) (struct comedi_device *, comedi_subdevice *);
/* int (*do_lock)(struct comedi_device *,comedi_subdevice *); */
/* int (*do_unlock)(struct comedi_device *,comedi_subdevice *); */
/* 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);
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);
enum dma_data_direction async_dma_dir;
......@@ -238,7 +237,7 @@ struct comedi_async_struct {
int (*cb_func) (unsigned int flags, void *);
void *cb_arg;
int (*inttrig) (comedi_device *dev, comedi_subdevice *s,
int (*inttrig) (struct comedi_device *dev, comedi_subdevice *s,
unsigned int x);
};
......@@ -247,8 +246,8 @@ struct comedi_driver_struct {
const char *driver_name;
struct module *module;
int (*attach) (comedi_device *, comedi_devconfig *);
int (*detach) (comedi_device *);
int (*attach) (struct comedi_device *, comedi_devconfig *);
int (*detach) (struct comedi_device *);
/* number of elements in board_name and board_id arrays */
unsigned int num_names;
......@@ -257,7 +256,7 @@ struct comedi_driver_struct {
int offset;
};
struct comedi_device_struct {
struct comedi_device {
int use_count;
comedi_driver *driver;
void *private;
......@@ -289,12 +288,12 @@ struct comedi_device_struct {
struct fasync_struct *async_queue;
void (*open) (comedi_device *dev);
void (*close) (comedi_device *dev);
void (*open) (struct comedi_device *dev);
void (*close) (struct comedi_device *dev);
};
struct comedi_device_file_info {
comedi_device *device;
struct comedi_device *device;
comedi_subdevice *read_subdevice;
comedi_subdevice *write_subdevice;
};
......@@ -309,8 +308,8 @@ static const int comedi_debug;
* function prototypes
*/
void comedi_event(comedi_device *dev, comedi_subdevice *s);
void comedi_error(const comedi_device *dev, const char *s);
void comedi_event(struct comedi_device *dev, comedi_subdevice *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
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;
}
void comedi_device_detach(comedi_device *dev);
int comedi_device_attach(comedi_device *dev, comedi_devconfig *it);
void comedi_device_detach(struct comedi_device *dev);
int comedi_device_attach(struct comedi_device *dev, comedi_devconfig *it);
int comedi_driver_register(comedi_driver *);
int comedi_driver_unregister(comedi_driver *);
void init_polling(void);
void cleanup_polling(void);
void start_polling(comedi_device *);
void stop_polling(comedi_device *);
void start_polling(struct 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);
#ifdef CONFIG_PROC_FS
......@@ -383,12 +382,12 @@ enum subdevice_runflags {
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);
void comedi_set_subdevice_runflags(comedi_subdevice *s, unsigned mask,
unsigned bits);
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);
/* range stuff */
......@@ -422,7 +421,7 @@ struct comedi_lrange_struct {
/* 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 i;
......@@ -441,7 +440,7 @@ static inline int alloc_subdevices(comedi_device *dev,
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);
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
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)
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);
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);
int comedi_pci_auto_config(struct pci_dev *pcidev, const char *board_name);
void comedi_pci_auto_unconfig(struct pci_dev *pcidev);
......
......@@ -47,13 +47,13 @@
#include <asm/io.h>
#include <asm/system.h>
static int postconfig(comedi_device *dev);
static int insn_rw_emulate_bits(comedi_device *dev, comedi_subdevice *s,
static int postconfig(struct comedi_device *dev);
static int insn_rw_emulate_bits(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data);
static void *comedi_recognize(comedi_driver * driv, const char *name);
static void comedi_report_boards(comedi_driver *driv);
static int poll_invalid(comedi_device *dev, comedi_subdevice *s);
int comedi_buf_alloc(comedi_device *dev, comedi_subdevice *s,
static int poll_invalid(struct comedi_device *dev, comedi_subdevice *s);
int comedi_buf_alloc(struct comedi_device *dev, comedi_subdevice *s,
unsigned long new_size);
comedi_driver *comedi_drivers;
......@@ -63,7 +63,7 @@ int comedi_modprobe(int minor)
return -EINVAL;
}
static void cleanup_device(comedi_device *dev)
static void cleanup_device(struct comedi_device *dev)
{
int i;
comedi_subdevice *s;
......@@ -95,7 +95,7 @@ static void cleanup_device(comedi_device *dev)
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;
if (dev->driver) {
......@@ -106,14 +106,14 @@ static void __comedi_device_detach(comedi_device *dev)
cleanup_device(dev);
}
void comedi_device_detach(comedi_device *dev)
void comedi_device_detach(struct comedi_device *dev)
{
if (!dev->attached)
return;
__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;
int ret;
......@@ -196,7 +196,7 @@ int comedi_driver_unregister(comedi_driver *driver)
/* check for devices using this driver */
for (i = 0; i < COMEDI_NUM_BOARD_MINORS; 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;
dev = dev_file_info->device;
......@@ -224,7 +224,7 @@ int comedi_driver_unregister(comedi_driver *driver)
return -EINVAL;
}
static int postconfig(comedi_device *dev)
static int postconfig(struct comedi_device *dev)
{
int i;
comedi_subdevice *s;
......@@ -331,18 +331,18 @@ void comedi_report_boards(comedi_driver *driv)
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;
}
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)
{
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 new_insn;
......@@ -412,7 +412,7 @@ static inline unsigned long kvirt_to_kva(unsigned long adr)
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)
{
comedi_async *async = s->async;
......
......@@ -105,8 +105,8 @@ struct subdev_8255_struct {
#define CALLBACK_FUNC (((struct subdev_8255_struct *)s->private)->cb_func)
#define subdevpriv ((struct subdev_8255_struct *)s->private)
static int dev_8255_attach(comedi_device * dev, comedi_devconfig * it);
static int dev_8255_detach(comedi_device * dev);
static int dev_8255_attach(struct comedi_device *dev, comedi_devconfig * it);
static int dev_8255_detach(struct comedi_device *dev);
static comedi_driver driver_8255 = {
driver_name:"8255",
module:THIS_MODULE,
......@@ -116,9 +116,9 @@ static comedi_driver 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;
......@@ -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)
{
if (data[0]) {
......@@ -168,7 +168,7 @@ static int subdev_8255_insn(comedi_device * dev, comedi_subdevice * s,
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)
{
unsigned int mask;
......@@ -205,7 +205,7 @@ static int subdev_8255_insn_config(comedi_device * dev, comedi_subdevice * s,
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;
......@@ -222,7 +222,7 @@ static void do_config(comedi_device * dev, comedi_subdevice * s)
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)
{
int err = 0;
......@@ -297,21 +297,21 @@ static int subdev_8255_cmdtest(comedi_device * dev, comedi_subdevice * s,
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 */
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 */
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)
{
s->type = COMEDI_SUBD_DIO;
......@@ -340,7 +340,7 @@ int subdev_8255_init(comedi_device * dev, comedi_subdevice * s, int (*cb) (int,
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 ret;
......@@ -358,7 +358,7 @@ int subdev_8255_init_irq(comedi_device * dev, comedi_subdevice * s,
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 (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;
unsigned long iobase;
......@@ -416,7 +416,7 @@ static int dev_8255_attach(comedi_device * dev, comedi_devconfig * it)
return 0;
}
static int dev_8255_detach(comedi_device * dev)
static int dev_8255_detach(struct comedi_device *dev)
{
int i;
unsigned long iobase;
......
......@@ -28,16 +28,16 @@
#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 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);
void subdev_8255_cleanup(comedi_device * dev, comedi_subdevice * s);
void subdev_8255_interrupt(comedi_device * dev, comedi_subdevice * s);
void subdev_8255_cleanup(struct comedi_device * dev, comedi_subdevice * s);
void subdev_8255_interrupt(struct comedi_device * dev, comedi_subdevice * s);
#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)
{
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;
}
static inline void subdev_8255_cleanup(comedi_device * dev,
static inline void subdev_8255_cleanup(struct comedi_device * dev,
comedi_subdevice * s)
{
}
......
......@@ -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_HI 3 /* Digital input high byte (DI8-DI15) */
static int acl7225b_attach(comedi_device * dev, comedi_devconfig * it);
static int acl7225b_detach(comedi_device * dev);
static int acl7225b_attach(struct comedi_device *dev, comedi_devconfig * it);
static int acl7225b_detach(struct comedi_device *dev);
typedef struct {
const char *name; // driver name
......@@ -50,7 +50,7 @@ static comedi_driver 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)
{
if (insn->n != 2)
......@@ -71,7 +71,7 @@ static int acl7225b_do_insn(comedi_device * dev, comedi_subdevice * s,
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)
{
if (insn->n != 2)
......@@ -83,7 +83,7 @@ static int acl7225b_di_insn(comedi_device * dev, comedi_subdevice * s,
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;
int iobase, iorange;
......@@ -138,7 +138,7 @@ static int acl7225b_attach(comedi_device * dev, comedi_devconfig * it)
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);
......
......@@ -32,7 +32,7 @@
| BYTE_ b_InputClockLevel, |
| BYTE_ b_OutputLevel, |
| 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)
|
+----------------------------------------------------------------------------+
......@@ -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)
{
......@@ -406,7 +406,7 @@ INT i_APCI1710_InsnConfigInitTimer(comedi_device * dev, comedi_subdevice * s,
| BYTE_ b_ModulNbr, |
| BYTE_ b_TimerNbr, |
| 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) |
+----------------------------------------------------------------------------+
| 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_insn * insn, unsigned int * data)
{
......@@ -561,7 +561,7 @@ INT i_APCI1710_InsnWriteEnableDisableTimer(comedi_device * dev,
| (BYTE_ b_BoardHandle, |
| BYTE_ b_ModulNbr, |
| 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) |
+----------------------------------------------------------------------------+
| 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)
{
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) |
+----------------------------------------------------------------------------+
| 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)
{
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,
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,
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,
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,
ULONG ul_WriteValue)
{
......
......@@ -34,40 +34,40 @@
/*
* 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);
INT i_APCI1710_InsnWriteEnableDisableTimer(comedi_device *dev,
INT i_APCI1710_InsnWriteEnableDisableTimer(struct comedi_device *dev,
comedi_subdevice *s,
comedi_insn *insn, unsigned int *data);
/*
* 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);
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);
/*
* 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,
PULONG pul_TimerValue);
INT i_APCI1710_GetTimerOutputLevel(comedi_device *dev,
INT i_APCI1710_GetTimerOutputLevel(struct comedi_device *dev,
BYTE b_ModulNbr, BYTE b_TimerNbr,
PBYTE pb_OutputLevel);
INT i_APCI1710_GetTimerProgressStatus(comedi_device *dev,
INT i_APCI1710_GetTimerProgressStatus(struct comedi_device *dev,
BYTE b_ModulNbr, BYTE b_TimerNbr,
PBYTE pb_TimerStatus);
/*
* 82X54 WRITE FUNCTION
*/
INT i_APCI1710_WriteTimerValue(comedi_device *dev,
INT i_APCI1710_WriteTimerValue(struct comedi_device *dev,
BYTE b_ModulNbr, BYTE b_TimerNbr,
ULONG ul_WriteValue);
......@@ -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)
{
INT i_ReturnValue = 0;
......@@ -790,7 +790,7 @@ INT i_APCI1710_InsnConfigInitChrono(comedi_device * dev, comedi_subdevice * s,
| BYTE_ b_ModulNbr, |
| BYTE_ b_CycleMode, |
| 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) |
+----------------------------------------------------------------------------+
| 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)
{
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) |
+----------------------------------------------------------------------------+
| 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)
{
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)
{
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,
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,
ULONG ul_ChronoValue,
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) |
+----------------------------------------------------------------------------+
| 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)
{
INT i_ReturnValue = 0;
......
......@@ -35,10 +35,10 @@
/*
* 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);
INT i_APCI1710_InsnWriteEnableDisableChrono(comedi_device *dev,
INT i_APCI1710_InsnWriteEnableDisableChrono(struct comedi_device *dev,
comedi_subdevice *s,
comedi_insn *insn,
unsigned int *data);
......@@ -46,18 +46,18 @@ INT i_APCI1710_InsnWriteEnableDisableChrono(comedi_device *dev,
/*
* 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);
INT i_APCI1710_GetChronoProgressStatus(comedi_device *dev,
INT i_APCI1710_GetChronoProgressStatus(struct comedi_device *dev,
BYTE b_ModulNbr, PBYTE pb_ChronoStatus);
INT i_APCI1710_ReadChronoValue(comedi_device *dev,
INT i_APCI1710_ReadChronoValue(struct comedi_device *dev,
BYTE b_ModulNbr,
UINT ui_TimeOut, PBYTE pb_ChronoStatus,
PULONG pul_ChronoValue);
INT i_APCI1710_ConvertChronoValue(comedi_device *dev,
INT i_APCI1710_ConvertChronoValue(struct comedi_device *dev,
BYTE b_ModulNbr,
ULONG ul_ChronoValue,
PULONG pul_Hour,
......@@ -69,6 +69,6 @@ INT i_APCI1710_ConvertChronoValue(comedi_device *dev,
/*
* 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,
unsigned int *data);
......@@ -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)|
+----------------------------------------------------------------------------+
| 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)
{
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)
+----------------------------------------------------------------------------+
......@@ -293,7 +293,7 @@ INT i_APCI1710_InsnConfigDigitalIO(comedi_device * dev, comedi_subdevice * s,
// BYTE_ b_InputChannel,
//
// 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)
{
INT i_ReturnValue = 0;
......@@ -481,7 +481,7 @@ INT i_APCI1710_InsnReadDigitalIOChlValue(comedi_device * dev,
//_INT_ i_APCI1710_SetDigitalIOChlOn (BYTE_ b_BoardHandle,
// BYTE_ b_ModulNbr,
// 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)
{
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)
+----------------------------------------------------------------------------+
| Task : write:
......@@ -728,7 +728,7 @@ INT i_APCI1710_InsnWriteDigitalIOChlOnOff(comedi_device * dev,
//_INT_ i_APCI1710_SetDigitalIOPortOn (BYTE_ b_BoardHandle,
// BYTE_ b_ModulNbr,
// 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)
{
INT i_ReturnValue = 0;
......
......@@ -27,20 +27,20 @@
/*
* 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);
/*
* INPUT OUTPUT FUNCTIONS
*/
INT i_APCI1710_InsnReadDigitalIOChlValue(comedi_device *dev,
INT i_APCI1710_InsnReadDigitalIOChlValue(struct comedi_device *dev,
comedi_subdevice *s,
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_insn *insn, unsigned int *data);
INT i_APCI1710_InsnBitsDigitalIOPortOnOff(comedi_device *dev,
INT i_APCI1710_InsnBitsDigitalIOPortOnOff(struct comedi_device *dev,
comedi_subdevice *s,
comedi_insn *insn, unsigned int *data);
......@@ -132,22 +132,22 @@
#define APCI1710_INCCPT_DISABLEFREQUENCYMEASUREMENT 409
/************ 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);
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);
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);
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);
/*********** Supplementary Functions********/
/* INSN CONFIG */
INT i_APCI1710_InitCounter(comedi_device *dev,
INT i_APCI1710_InitCounter(struct comedi_device *dev,
BYTE b_ModulNbr,
BYTE b_CounterRange,
BYTE b_FirstCounterModus,
......@@ -155,25 +155,25 @@ INT i_APCI1710_InitCounter(comedi_device *dev,
BYTE b_SecondCounterModus,
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_ReferenceAction,
BYTE b_IndexOperation, BYTE b_AutoMode,
BYTE b_InterruptEnable);
INT i_APCI1710_InitReference(comedi_device *dev,
INT i_APCI1710_InitReference(struct comedi_device *dev,
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_ExternalStrobeLevel);
INT i_APCI1710_InitCompareLogic(comedi_device *dev,
INT i_APCI1710_InitCompareLogic(struct comedi_device *dev,
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_PCIInputClock,
BYTE b_TimingUnity,
......@@ -181,91 +181,91 @@ INT i_APCI1710_InitFrequencyMeasurement(comedi_device *dev,
PULONG pul_RealTimingInterval);
/* 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_Filter);
INT i_APCI1710_LatchCounter(comedi_device *dev,
INT i_APCI1710_LatchCounter(struct comedi_device *dev,
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_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 */
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,
UINT ui_WriteValue);
INT i_APCI1710_Write32BitCounterValue(comedi_device *dev,
INT i_APCI1710_Write32BitCounterValue(struct comedi_device *dev,
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_InterruptEnable);
INT i_APCI1710_DisableFrequencyMeasurement(comedi_device *dev,
INT i_APCI1710_DisableFrequencyMeasurement(struct comedi_device *dev,
BYTE b_ModulNbr);
/* INSN READ */
INT i_APCI1710_ReadLatchRegisterStatus(comedi_device *dev,
INT i_APCI1710_ReadLatchRegisterStatus(struct comedi_device *dev,
BYTE b_ModulNbr, BYTE b_LatchReg,
PBYTE pb_LatchStatus);
INT i_APCI1710_ReadLatchRegisterValue(comedi_device *dev,
INT i_APCI1710_ReadLatchRegisterValue(struct comedi_device *dev,
BYTE b_ModulNbr, BYTE b_LatchReg,
PULONG pul_LatchValue);
INT i_APCI1710_Read16BitCounterValue(comedi_device *dev,
INT i_APCI1710_Read16BitCounterValue(struct comedi_device *dev,
BYTE b_ModulNbr, BYTE b_SelectedCounter,
PUINT pui_CounterValue);
INT i_APCI1710_Read32BitCounterValue(comedi_device *dev,
INT i_APCI1710_Read32BitCounterValue(struct comedi_device *dev,
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);
INT i_APCI1710_GetReferenceStatus(comedi_device *dev,
INT i_APCI1710_GetReferenceStatus(struct comedi_device *dev,
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);
INT i_APCI1710_GetCBStatus(comedi_device *dev,
INT i_APCI1710_GetCBStatus(struct comedi_device *dev,
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,
PBYTE pb_CBStatusCounter1);
INT i_APCI1710_GetUDStatus(comedi_device *dev,
INT i_APCI1710_GetUDStatus(struct comedi_device *dev,
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);
INT i_APCI1710_ReadFrequencyMeasurement(comedi_device *dev,
INT i_APCI1710_ReadFrequencyMeasurement(struct comedi_device *dev,
BYTE b_ModulNbr,
PBYTE pb_Status, PBYTE pb_UDStatus,
PULONG pul_ReadValue);
......@@ -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)
{
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)
{
INT i_ReturnValue = 0;
......@@ -708,7 +708,7 @@ INT i_APCI1710_InsnWriteEnableDisablePulseEncoder(comedi_device * dev,
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)
{
INT i_ReturnValue = 0;
......@@ -834,7 +834,7 @@ INT i_APCI1710_InsnBitsReadWritePulseEncoder(comedi_device * dev,
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)
{
......
......@@ -21,11 +21,11 @@
#define APCI1710_PULSEENCODER_READ 0
#define APCI1710_PULSEENCODER_WRITE 1
INT i_APCI1710_InsnConfigInitPulseEncoder(comedi_device *dev,
INT i_APCI1710_InsnConfigInitPulseEncoder(struct comedi_device *dev,
comedi_subdevice *s,
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_insn *insn,
unsigned int *data);
......@@ -33,7 +33,7 @@ INT i_APCI1710_InsnWriteEnableDisablePulseEncoder(comedi_device *dev,
/*
* READ PULSE ENCODER FUNCTIONS
*/
INT i_APCI1710_InsnReadInterruptPulseEncoder(comedi_device *dev,
INT i_APCI1710_InsnReadInterruptPulseEncoder(struct comedi_device *dev,
comedi_subdevice *s,
comedi_insn *insn,
unsigned int *data);
......@@ -41,7 +41,7 @@ INT i_APCI1710_InsnReadInterruptPulseEncoder(comedi_device *dev,
/*
* WRITE PULSE ENCODER FUNCTIONS
*/
INT i_APCI1710_InsnBitsReadWritePulseEncoder(comedi_device *dev,
INT i_APCI1710_InsnBitsReadWritePulseEncoder(struct comedi_device *dev,
comedi_subdevice *s,
comedi_insn *insn,
unsigned int *data);
......@@ -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) |
+----------------------------------------------------------------------------+
| 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)
{
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_PWM,
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_PWM,
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) |
+----------------------------------------------------------------------------+
| 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)
{
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_PWM,
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;
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_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)
{
INT i_ReturnValue = 0;
......@@ -3561,7 +3561,7 @@ INT i_APCI1710_InsnReadGetPWMStatus(comedi_device * dev, comedi_subdevice * s,
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)
{
data[0] = devpriv->s_InterruptParameters.
......
......@@ -26,10 +26,10 @@
#define APCI1710_PWM_ENABLE 1
#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);
INT i_APCI1710_InitPWM(comedi_device *dev,
INT i_APCI1710_InitPWM(struct comedi_device *dev,
BYTE b_ModulNbr,
BYTE b_PWM,
BYTE b_ClockSelection,
......@@ -38,7 +38,7 @@ INT i_APCI1710_InitPWM(comedi_device *dev,
ULONG ul_HighTiming,
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_PWM,
PBYTE pb_TimingUnit,
......@@ -50,10 +50,10 @@ INT i_APCI1710_GetPWMInitialisation(comedi_device *dev,
PBYTE pb_ExternGate,
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);
INT i_APCI1710_EnablePWM(comedi_device *dev,
INT i_APCI1710_EnablePWM(struct comedi_device *dev,
BYTE b_ModulNbr,
BYTE b_PWM,
BYTE b_StartLevel,
......@@ -61,16 +61,16 @@ INT i_APCI1710_EnablePWM(comedi_device *dev,
BYTE b_StopLevel, BYTE b_ExternGate,
BYTE b_InterruptEnable);
INT i_APCI1710_SetNewPWMTiming(comedi_device *dev,
INT i_APCI1710_SetNewPWMTiming(struct comedi_device *dev,
BYTE b_ModulNbr,
BYTE b_PWM, BYTE b_TimingUnit,
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);
INT i_APCI1710_InsnBitsReadPWMInterrupt(comedi_device *dev,
INT i_APCI1710_InsnBitsReadPWMInterrupt(struct comedi_device *dev,
comedi_subdevice *s,
comedi_insn *insn, unsigned int *data);
......@@ -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)
{
INT i_ReturnValue = 0;
......@@ -362,7 +362,7 @@ INT i_APCI1710_InsnConfigInitSSI(comedi_device * dev, comedi_subdevice * s,
| BYTE_ b_SelectedSSI, |
| PULONG_ pul_Position, |
| 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) |
+----------------------------------------------------------------------------+
| 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)
{
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)
{
INT i_ReturnValue = 0;
......
......@@ -33,11 +33,11 @@
/*
* 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);
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);
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);
......@@ -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)
{
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)
{
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)
{
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)
{
INT i_ReturnValue = 0;
......
......@@ -35,23 +35,23 @@
/*
* TOR_COUNTER INISIALISATION FUNCTION
*/
INT i_APCI1710_InsnConfigInitTorCounter(comedi_device *dev,
INT i_APCI1710_InsnConfigInitTorCounter(struct comedi_device *dev,
comedi_subdevice *s,
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_insn *insn,
unsigned int *data);
INT i_APCI1710_InsnReadGetTorCounterInitialisation(comedi_device *dev,
INT i_APCI1710_InsnReadGetTorCounterInitialisation(struct comedi_device *dev,
comedi_subdevice *s,
comedi_insn *insn,
unsigned int *data);
/*
* TOR_COUNTER READ FUNCTION
*/
INT i_APCI1710_InsnBitsGetTorCounterProgressStatusAndValue(comedi_device *dev,
INT i_APCI1710_InsnBitsGetTorCounterProgressStatusAndValue(struct comedi_device *dev,
comedi_subdevice *s,
comedi_insn *insn,
unsigned int *data);
......@@ -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)
{
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)
{
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)
{
INT i_ReturnValue = 0;
......@@ -792,7 +792,7 @@ INT i_APCI1710_InsnReadTTLIOAllPortValue(comedi_device * dev,
| (BYTE_ b_BoardHandle, |
| BYTE_ b_ModulNbr, |
| 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) |
+----------------------------------------------------------------------------+
| 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)
{
INT i_ReturnValue = 0;
......
......@@ -24,21 +24,21 @@
/*
* 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);
/*
* 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);
INT i_APCI1710_InsnReadTTLIOAllPortValue(comedi_device *dev,
INT i_APCI1710_InsnReadTTLIOAllPortValue(struct comedi_device *dev,
comedi_subdevice *s,
comedi_insn *insn, unsigned int *data);
/*
* TTL OUTPUT FUNCTIONS
*/
INT i_APCI1710_InsnWriteSetTTLIOChlOnOff(comedi_device *dev,
INT i_APCI1710_InsnWriteSetTTLIOChlOnOff(struct comedi_device *dev,
comedi_subdevice *s,
comedi_insn *insn, unsigned int *data);
......@@ -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) |
| |
+----------------------------------------------------------------------------+
......@@ -2550,7 +2550,7 @@ COMEDI_PCI_INITCLEANUP(driver_addi, addi_apci_tbl);
| This function does all the initializations and memory |
| allocation of data structures for the driver. |
+----------------------------------------------------------------------------+
| Input Parameters :comedi_device *dev |
| Input Parameters :struct comedi_device *dev |
| 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;
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. |
| |
+----------------------------------------------------------------------------+
| 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) {
......@@ -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, |
| 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);
......@@ -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)
{
comedi_device *dev = d;
struct comedi_device *dev = d;
this_board->v_hwdrv_Interrupt(irq, d);
return IRQ_RETVAL(1);
}
......@@ -3029,14 +3029,14 @@ static irqreturn_t v_ADDI_Interrupt(int irq, void *d PT_REGS_ARG)
/*
+----------------------------------------------------------------------------+
| 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)
| |
+----------------------------------------------------------------------------+
| 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) |
| |
| |
......@@ -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)
{
WORD w_Data;
......
......@@ -112,108 +112,108 @@ typedef struct {
/* interrupt and reset */
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 */
/* ANALOG INPUT */
int (*i_hwdrv_InsnConfigAnalogInput)(comedi_device *dev,
int (*i_hwdrv_InsnConfigAnalogInput)(struct comedi_device *dev,
comedi_subdevice *s,
comedi_insn *insn,
unsigned int *data);
int (*i_hwdrv_InsnReadAnalogInput)(comedi_device *dev,
int (*i_hwdrv_InsnReadAnalogInput)(struct comedi_device *dev,
comedi_subdevice *s,
comedi_insn *insn,
unsigned int *data);
int (*i_hwdrv_InsnWriteAnalogInput)(comedi_device *dev,
int (*i_hwdrv_InsnWriteAnalogInput)(struct comedi_device *dev,
comedi_subdevice *s,
comedi_insn *insn,
unsigned int *data);
int (*i_hwdrv_InsnBitsAnalogInput)(comedi_device *dev,
int (*i_hwdrv_InsnBitsAnalogInput)(struct comedi_device *dev,
comedi_subdevice *s,
comedi_insn *insn,
unsigned int *data);
int (*i_hwdrv_CommandTestAnalogInput)(comedi_device *dev,
int (*i_hwdrv_CommandTestAnalogInput)(struct comedi_device *dev,
comedi_subdevice *s,
comedi_cmd *cmd);
int (*i_hwdrv_CommandAnalogInput)(comedi_device *dev,
int (*i_hwdrv_CommandAnalogInput)(struct comedi_device *dev,
comedi_subdevice *s);
int (*i_hwdrv_CancelAnalogInput)(comedi_device *dev,
int (*i_hwdrv_CancelAnalogInput)(struct comedi_device *dev,
comedi_subdevice *s);
/* Analog Output */
int (*i_hwdrv_InsnConfigAnalogOutput)(comedi_device *dev,
int (*i_hwdrv_InsnConfigAnalogOutput)(struct comedi_device *dev,
comedi_subdevice *s,
comedi_insn *insn,
unsigned int *data);
int (*i_hwdrv_InsnWriteAnalogOutput)(comedi_device *dev,
int (*i_hwdrv_InsnWriteAnalogOutput)(struct comedi_device *dev,
comedi_subdevice *s,
comedi_insn *insn,
unsigned int *data);
int (*i_hwdrv_InsnBitsAnalogOutput)(comedi_device *dev,
int (*i_hwdrv_InsnBitsAnalogOutput)(struct comedi_device *dev,
comedi_subdevice *s,
comedi_insn *insn,
unsigned int *data);
/* Digital Input */
int (*i_hwdrv_InsnConfigDigitalInput) (comedi_device *dev,
int (*i_hwdrv_InsnConfigDigitalInput) (struct comedi_device *dev,
comedi_subdevice *s,
comedi_insn *insn,
unsigned int *data);
int (*i_hwdrv_InsnReadDigitalInput) (comedi_device *dev,
int (*i_hwdrv_InsnReadDigitalInput) (struct comedi_device *dev,
comedi_subdevice *s,
comedi_insn *insn,
unsigned int *data);
int (*i_hwdrv_InsnWriteDigitalInput) (comedi_device *dev,
int (*i_hwdrv_InsnWriteDigitalInput) (struct comedi_device *dev,
comedi_subdevice *s,
comedi_insn *insn,
unsigned int *data);
int (*i_hwdrv_InsnBitsDigitalInput) (comedi_device *dev,
int (*i_hwdrv_InsnBitsDigitalInput) (struct comedi_device *dev,
comedi_subdevice *s,
comedi_insn *insn,
unsigned int *data);
/* Digital Output */
int (*i_hwdrv_InsnConfigDigitalOutput)(comedi_device *dev,
int (*i_hwdrv_InsnConfigDigitalOutput)(struct comedi_device *dev,
comedi_subdevice *s,
comedi_insn *insn,
unsigned int *data);
int (*i_hwdrv_InsnWriteDigitalOutput)(comedi_device *dev,
int (*i_hwdrv_InsnWriteDigitalOutput)(struct comedi_device *dev,
comedi_subdevice *s,
comedi_insn *insn,
unsigned int *data);
int (*i_hwdrv_InsnBitsDigitalOutput)(comedi_device *dev,
int (*i_hwdrv_InsnBitsDigitalOutput)(struct comedi_device *dev,
comedi_subdevice *s,
comedi_insn *insn,
unsigned int *data);
int (*i_hwdrv_InsnReadDigitalOutput)(comedi_device *dev,
int (*i_hwdrv_InsnReadDigitalOutput)(struct comedi_device *dev,
comedi_subdevice *s,
comedi_insn *insn,
unsigned int *data);
/* TIMER */
int (*i_hwdrv_InsnConfigTimer)(comedi_device *dev,
int (*i_hwdrv_InsnConfigTimer)(struct comedi_device *dev,
comedi_subdevice *s,
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,
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);
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);
/* TTL IO */
int (*i_hwdr_ConfigInitTTLIO)(comedi_device *dev,
int (*i_hwdr_ConfigInitTTLIO)(struct comedi_device *dev,
comedi_subdevice *s, comedi_insn *insn,
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);
int (*i_hwdr_ReadTTLIOAllPortValue)(comedi_device *dev,
int (*i_hwdr_ReadTTLIOAllPortValue)(struct comedi_device *dev,
comedi_subdevice *s,
comedi_insn *insn,
unsigned int *data);
int (*i_hwdr_WriteTTLIOChlOnOff)(comedi_device *dev,
int (*i_hwdr_WriteTTLIOChlOnOff)(struct comedi_device *dev,
comedi_subdevice *s,
comedi_insn *insn, unsigned int *data);
} boardtype;
......@@ -456,10 +456,10 @@ typedef struct {
static unsigned short pci_list_builded; /* set to 1 when list of card is known */
/* Function declarations */
static int i_ADDI_Attach(comedi_device *dev, comedi_devconfig *it);
static int i_ADDI_Detach(comedi_device *dev);
static int i_ADDI_Reset(comedi_device *dev);
static int i_ADDI_Attach(struct comedi_device *dev, comedi_devconfig *it);
static int i_ADDI_Detach(struct comedi_device *dev);
static int i_ADDI_Reset(struct comedi_device *dev);
static irqreturn_t v_ADDI_Interrupt(int irq, void *d PT_REGS_ARG);
static 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);
......@@ -121,7 +121,7 @@ typedef struct {
/*****************************************/
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,
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, |
| PCHAR pc_PCIChipInformation,comedi_device *dev) |
| PCHAR pc_PCIChipInformation,struct comedi_device *dev) |
+----------------------------------------------------------------------------+
| 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. |
| |
| comedi_device *dev : comedi device structure |
| struct comedi_device *dev : comedi device structure |
| pointer |
+----------------------------------------------------------------------------+
| Output Parameters : - |
......@@ -805,7 +805,7 @@ VOID v_EepromCs76Read(DWORD dw_Address, WORD w_offset, PWORD pw_Value)
*/
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;
UINT ui_Temp;
......
......@@ -56,7 +56,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
#include "APCI1710_Pwm.c"
#include "APCI1710_INCCPT.c"
void i_ADDI_AttachPCI1710(comedi_device * dev)
void i_ADDI_AttachPCI1710(struct comedi_device * dev)
{
comedi_subdevice *s;
int ret = 0;
......@@ -195,11 +195,11 @@ void i_ADDI_AttachPCI1710(comedi_device * dev)
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);
//for 1710
int i_APCI1710_Reset(comedi_device * dev)
int i_APCI1710_Reset(struct comedi_device * dev)
{
int ret;
DWORD dw_Dummy;
......@@ -249,7 +249,7 @@ int i_APCI1710_Reset(comedi_device * dev)
VOID v_APCI1710_Interrupt(int irq, void *d)
{
comedi_device *dev = d;
struct comedi_device *dev = d;
BYTE b_ModuleCpt = 0;
BYTE b_InterruptFlag = 0;
BYTE b_PWMCpt = 0;
......
......@@ -58,12 +58,12 @@ INT i_Flag = 1;
/*
+----------------------------------------------------------------------------+
| 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) |
+----------------------------------------------------------------------------+
| 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 |
| 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)
{
UINT ui_Status = 0;
......@@ -254,12 +254,12 @@ INT i_APCI035_ConfigTimerWatchdog(comedi_device * dev, comedi_subdevice * s,
/*
+----------------------------------------------------------------------------+
| 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) |
+----------------------------------------------------------------------------+
| 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 |
| 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)
{
UINT ui_Command = 0;
......@@ -367,12 +367,12 @@ INT i_APCI035_StartStopWriteTimerWatchdog(comedi_device * dev,
/*
+----------------------------------------------------------------------------+
| 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) |
+----------------------------------------------------------------------------+
| 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 |
| 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)
{
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 |
| (comedi_device *dev,comedi_subdevice *s, |
| (struct comedi_device *dev,comedi_subdevice *s, |
| comedi_insn *insn,unsigned int *data) |
+----------------------------------------------------------------------------+
| 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_insn *insn : Insn Structure Pointer |
| 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)
{
devpriv->tsk_Current = current;
......@@ -466,12 +466,12 @@ INT i_APCI035_ConfigAnalogInput(comedi_device * dev, comedi_subdevice * s,
/*
+----------------------------------------------------------------------------+
| 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) |
+----------------------------------------------------------------------------+
| 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 *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)
{
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 |
......@@ -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;
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)
{
comedi_device *dev = d;
struct comedi_device *dev = d;
UINT ui_StatusRegister1 = 0;
UINT ui_StatusRegister2 = 0;
UINT ui_ReadCommand = 0;
......
......@@ -101,23 +101,23 @@ comedi_lrange range_apci035_ai = { 8, {
/* TIMER */
/* 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);
INT i_APCI035_StartStopWriteTimerWatchdog(comedi_device *dev,
INT i_APCI035_StartStopWriteTimerWatchdog(struct comedi_device *dev,
comedi_subdevice *s,
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);
/* 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);
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);
/* Interrupt */
static void v_APCI035_Interrupt(int irq, void *d);
/* Reset functions */
INT i_APCI035_Reset(comedi_device *dev);
INT i_APCI035_Reset(struct comedi_device *dev);
......@@ -59,12 +59,12 @@ UINT ui_InterruptStatus = 0;
/*
+----------------------------------------------------------------------------+
| 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) |
+----------------------------------------------------------------------------+
| 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 |
| 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)
{
UINT ui_TmpValue;
......@@ -128,12 +128,12 @@ INT i_APCI1032_ConfigDigitalInput(comedi_device * dev, comedi_subdevice * s,
/*
+----------------------------------------------------------------------------+
| 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) |
+----------------------------------------------------------------------------+
| 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 |
| 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)
{
UINT ui_TmpValue = 0;
......@@ -166,12 +166,12 @@ INT i_APCI1032_Read1DigitalInput(comedi_device * dev, comedi_subdevice * s,
/*
+----------------------------------------------------------------------------+
| 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) |
+----------------------------------------------------------------------------+
| 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 *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)
{
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)
{
comedi_device *dev = d;
struct comedi_device *dev = d;
UINT ui_Temp;
//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 |
+----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev
| Input Parameters : struct comedi_device *dev
+----------------------------------------------------------------------------+
| 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
inl(devpriv->iobase + APCI1032_DIGITAL_IP_INTERRUPT_STATUS); //Reset the interrupt status register
......
......@@ -47,17 +47,17 @@
//DI
// 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);
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);
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);
// Interrupt functions.....
static VOID v_APCI1032_Interrupt(int irq, void *d);
//Reset
INT i_APCI1032_Reset(comedi_device *dev);
INT i_APCI1032_Reset(struct comedi_device *dev);
......@@ -116,50 +116,50 @@ enum {
};
/*----------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);
static int i_APCI1500_ConfigDigitalInputEvent(comedi_device *dev,
static int i_APCI1500_ConfigDigitalInputEvent(struct comedi_device *dev,
comedi_subdevice *s,
comedi_insn *insn,
unsigned int *data);
static int i_APCI1500_StartStopInputEvent(comedi_device *dev,
static int i_APCI1500_StartStopInputEvent(struct comedi_device *dev,
comedi_subdevice *s,
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_insn *insn, unsigned int *data);
/*---------- DIGITAL OUTPUT------------*/
static int i_APCI1500_ConfigDigitalOutputErrorInterrupt(comedi_device *dev,
static int i_APCI1500_ConfigDigitalOutputErrorInterrupt(struct comedi_device *dev,
comedi_subdevice *s,
comedi_insn *insn,
unsigned int *data);
static int i_APCI1500_WriteDigitalOutput(comedi_device *dev,
static int i_APCI1500_WriteDigitalOutput(struct comedi_device *dev,
comedi_subdevice *s,
comedi_insn *insn, unsigned int *data);
/*----------TIMER----------------*/
static int i_APCI1500_ConfigCounterTimerWatchdog(comedi_device *dev,
static int i_APCI1500_ConfigCounterTimerWatchdog(struct comedi_device *dev,
comedi_subdevice *s,
comedi_insn *insn,
unsigned int *data);
static int i_APCI1500_StartStopTriggerTimerCounterWatchdog(comedi_device *dev,
static int i_APCI1500_StartStopTriggerTimerCounterWatchdog(struct comedi_device *dev,
comedi_subdevice *s,
comedi_insn *insn,
unsigned int *data);
static int i_APCI1500_ReadCounterTimerWatchdog(comedi_device *dev,
static int i_APCI1500_ReadCounterTimerWatchdog(struct comedi_device *dev,
comedi_subdevice *s,
comedi_insn *insn,
unsigned int *data);
static int i_APCI1500_ReadInterruptMask(comedi_device *dev,
static int i_APCI1500_ReadInterruptMask(struct comedi_device *dev,
comedi_subdevice *s,
comedi_insn *insn, unsigned int *data);
/*----------INTERRUPT HANDLER------*/
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_insn *insn, unsigned int *data);
/*----------RESET---------------*/
static int i_APCI1500_Reset(comedi_device *dev);
static int i_APCI1500_Reset(struct comedi_device *dev);
......@@ -38,27 +38,27 @@
// Hardware Layer functions for Apci1516
//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);
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);
//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);
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);
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);
// TIMER
// 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);
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);
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);
//reset
INT i_APCI1516_Reset(comedi_device *dev);
INT i_APCI1516_Reset(struct comedi_device *dev);
......@@ -82,33 +82,33 @@
//DI
// 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);
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);
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);
//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);
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);
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);
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);
// TIMER
// 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_insn *insn, unsigned int *data);
int i_APCI1564_StartStopWriteTimerCounterWatchdog(comedi_device *dev,
int i_APCI1564_StartStopWriteTimerCounterWatchdog(struct comedi_device *dev,
comedi_subdevice *s,
comedi_insn *insn,
unsigned int *data);
int i_APCI1564_ReadTimerCounterWatchdog(comedi_device *dev,
int i_APCI1564_ReadTimerCounterWatchdog(struct comedi_device *dev,
comedi_subdevice *s,
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);
// RESET
INT i_APCI1564_Reset(comedi_device *dev);
INT i_APCI1564_Reset(struct comedi_device *dev);
......@@ -58,7 +58,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc
/*
+----------------------------------------------------------------------------+
| Function Name : INT i_APCI16XX_InsnConfigInitTTLIO |
| (comedi_device *dev, |
| (struct comedi_device *dev, |
| comedi_subdevice *s, |
| comedi_insn *insn, |
| 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)
{
INT i_ReturnValue = insn->n;
......@@ -251,7 +251,7 @@ int i_APCI16XX_InsnConfigInitTTLIO(comedi_device * dev,
/*
+----------------------------------------------------------------------------+
| Function Name : INT i_APCI16XX_InsnBitsReadTTLIO |
| (comedi_device *dev, |
| (struct comedi_device *dev, |
| comedi_subdevice *s, |
| comedi_insn *insn, |
| 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)
{
INT i_ReturnValue = insn->n;
......@@ -411,7 +411,7 @@ int i_APCI16XX_InsnBitsReadTTLIO(comedi_device * dev,
/*
+----------------------------------------------------------------------------+
| Function Name : INT i_APCI16XX_InsnReadTTLIOAllPortValue |
| (comedi_device *dev, |
| (struct comedi_device *dev, |
| comedi_subdevice *s, |
| comedi_insn *insn, |
| 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)
{
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 |
| (comedi_device *dev, |
| (struct comedi_device *dev, |
| comedi_subdevice *s, |
| comedi_insn *insn, |
| 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)
{
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 |
+----------------------------------------------------------------------------+
| Input Parameters : comedi_device *dev |
| Input Parameters : struct comedi_device *dev |
+----------------------------------------------------------------------------+
| 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;
}
......@@ -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,
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,
unsigned int *data);
int i_APCI16XX_InsnReadTTLIOAllPortValue(comedi_device *dev,
int i_APCI16XX_InsnReadTTLIOAllPortValue(struct comedi_device *dev,
comedi_subdevice *s,
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,
unsigned int *data);
int i_APCI16XX_Reset(comedi_device *dev);
int i_APCI16XX_Reset(struct comedi_device *dev);
#endif
......@@ -40,25 +40,25 @@
// Hardware Layer functions for Apci2016
//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);
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);
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);
// TIMER
// 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);
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);
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);
// Interrupt functions.....
......@@ -67,4 +67,4 @@ int i_APCI2016_ReadWatchdog(comedi_device *dev, comedi_subdevice *s,
//VOID v_APCI2016_Interrupt(int irq, void *d);
// RESET
INT i_APCI2016_Reset(comedi_device *dev);
INT i_APCI2016_Reset(struct comedi_device *dev);
......@@ -55,22 +55,22 @@
// Hardware Layer functions for Apci2032
//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);
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);
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);
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);
// TIMER
// 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);
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);
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);
// Interrupt functions.....
......@@ -78,4 +78,4 @@ int i_APCI2032_ReadWatchdog(comedi_device *dev, comedi_subdevice *s,
void v_APCI2032_Interrupt(int irq, void *d);
//Reset functions
int i_APCI2032_Reset(comedi_device *dev);
int i_APCI2032_Reset(struct comedi_device *dev);
......@@ -36,26 +36,26 @@
// Hardware Layer functions for Apci2200
//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);
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);
//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);
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);
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);
// 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);
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);
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);
//reset
INT i_APCI2200_Reset(comedi_device *dev);
INT i_APCI2200_Reset(struct comedi_device *dev);
......@@ -178,64 +178,64 @@ typedef struct {
// Function Declaration For APCI-3120
// 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 i_APCI3120_ExttrigEnable(comedi_device *dev);
int i_APCI3120_ExttrigDisable(comedi_device *dev);
int i_APCI3120_StopCyclicAcquisition(comedi_device *dev, comedi_subdevice *s);
int i_APCI3120_Reset(comedi_device *dev);
int i_APCI3120_CyclicAnalogInput(int mode, comedi_device *dev,
int i_APCI3120_ExttrigEnable(struct comedi_device *dev);
int i_APCI3120_ExttrigDisable(struct comedi_device *dev);
int i_APCI3120_StopCyclicAcquisition(struct comedi_device *dev, comedi_subdevice *s);
int i_APCI3120_Reset(struct comedi_device *dev);
int i_APCI3120_CyclicAnalogInput(int mode, struct comedi_device *dev,
comedi_subdevice *s);
// Interrupt functions
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);
void v_APCI3120_InterruptDmaMoveBlock16bit(comedi_device *dev,
//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(struct comedi_device *dev,
comedi_subdevice *s,
short *dma_buffer,
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);
// 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);
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);
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);
//DI
// 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);
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);
//DO
//int i_APCI3120_WriteDigitalOutput(comedi_device *dev, BYTE data);
int i_APCI3120_InsnConfigDigitalOutput(comedi_device *dev,
//int i_APCI3120_WriteDigitalOutput(struct comedi_device *dev, BYTE data);
int i_APCI3120_InsnConfigDigitalOutput(struct comedi_device *dev,
comedi_subdevice *s, comedi_insn *insn,
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);
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);
//AO
//int i_APCI3120_Write1AnalogValue(comedi_device *dev,UINT ui_Range,UINT ui_Channel,UINT data );
int i_APCI3120_InsnWriteAnalogOutput(comedi_device *dev, comedi_subdevice *s,
//int i_APCI3120_Write1AnalogValue(struct comedi_device *dev,UINT ui_Range,UINT ui_Channel,UINT data );
int i_APCI3120_InsnWriteAnalogOutput(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data);
//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);
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);
int i_APCI3120_CommandTestAnalogInput(comedi_device *dev, comedi_subdevice *s,
int i_APCI3120_CommandTestAnalogInput(struct comedi_device *dev, comedi_subdevice *s,
comedi_cmd *cmd);
int i_APCI3120_CommandAnalogInput(comedi_device *dev, comedi_subdevice *s);
//int i_APCI3120_CancelAnalogInput(comedi_device *dev, comedi_subdevice *s);
int i_APCI3120_StopCyclicAcquisition(comedi_device *dev, comedi_subdevice *s);
int i_APCI3120_CommandAnalogInput(struct comedi_device *dev, comedi_subdevice *s);
//int i_APCI3120_CancelAnalogInput(struct comedi_device *dev, comedi_subdevice *s);
int i_APCI3120_StopCyclicAcquisition(struct comedi_device *dev, comedi_subdevice *s);
......@@ -154,34 +154,34 @@ typedef struct {
//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);
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);
INT i_APCI3200_InsnWriteReleaseAnalogInput(comedi_device *dev,
INT i_APCI3200_InsnWriteReleaseAnalogInput(struct comedi_device *dev,
comedi_subdevice *s,
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_insn *insn, unsigned int *data);
INT i_APCI3200_StopCyclicAcquisition(comedi_device *dev, comedi_subdevice *s);
INT i_APCI3200_InterruptHandleEos(comedi_device *dev);
INT i_APCI3200_CommandTestAnalogInput(comedi_device *dev, comedi_subdevice *s,
INT i_APCI3200_StopCyclicAcquisition(struct comedi_device *dev, comedi_subdevice *s);
INT i_APCI3200_InterruptHandleEos(struct comedi_device *dev);
INT i_APCI3200_CommandTestAnalogInput(struct comedi_device *dev, comedi_subdevice *s,
comedi_cmd *cmd);
INT i_APCI3200_CommandAnalogInput(comedi_device *dev, comedi_subdevice *s);
INT i_APCI3200_ReadDigitalInput(comedi_device *dev, comedi_subdevice *s,
INT i_APCI3200_CommandAnalogInput(struct comedi_device *dev, comedi_subdevice *s);
INT i_APCI3200_ReadDigitalInput(struct comedi_device *dev, comedi_subdevice *s,
comedi_insn *insn, unsigned int *data);
//Interrupt
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
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_ReadCJCValue(comedi_device *dev, unsigned int *data);
int i_APCI3200_ReadCalibrationGainValue(comedi_device *dev, UINT *data);
int i_APCI3200_ReadCalibrationOffsetValue(comedi_device *dev, UINT *data);
int i_APCI3200_Read1AnalogInputChannel(comedi_device *dev,
int i_APCI3200_ReadCJCCalOffset(struct comedi_device *dev, unsigned int *data);
int i_APCI3200_ReadCJCValue(struct comedi_device *dev, unsigned int *data);
int i_APCI3200_ReadCalibrationGainValue(struct comedi_device *dev, UINT *data);
int i_APCI3200_ReadCalibrationOffsetValue(struct comedi_device *dev, UINT *data);
int i_APCI3200_Read1AnalogInputChannel(struct comedi_device *dev,
comedi_subdevice *s, comedi_insn *insn,
unsigned int *data);
int i_APCI3200_ReadCJCCalGain(comedi_device *dev, unsigned int *data);
int i_APCI3200_ReadCJCCalGain(struct comedi_device *dev, unsigned int *data);
......@@ -55,40 +55,40 @@ comedi_lrange range_apci3501_ao = { 2, {
// Hardware Layer functions for Apci3501
//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);
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);
//DI
// 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);
//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);
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);
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);
// TIMER
// 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_insn *insn, unsigned int *data);
int i_APCI3501_StartStopWriteTimerCounterWatchdog(comedi_device *dev,
int i_APCI3501_StartStopWriteTimerCounterWatchdog(struct comedi_device *dev,
comedi_subdevice *s,
comedi_insn *insn,
unsigned int *data);
int i_APCI3501_ReadTimerCounterWatchdog(comedi_device *dev,
int i_APCI3501_ReadTimerCounterWatchdog(struct comedi_device *dev,
comedi_subdevice *s,
comedi_insn *insn, unsigned int *data);
//Interrupt
void v_APCI3501_Interrupt(int irq, void *d);
//Reset functions
int i_APCI3501_Reset(comedi_device *dev);
int i_APCI3501_Reset(struct comedi_device *dev);
......@@ -63,8 +63,8 @@ typedef struct {
#define devpriv ((adl_pci7296_private *)dev->private)
static int adl_pci7296_attach(comedi_device * dev, comedi_devconfig * it);
static int adl_pci7296_detach(comedi_device * dev);
static int adl_pci7296_attach(struct comedi_device * dev, comedi_devconfig * it);
static int adl_pci7296_detach(struct comedi_device * dev);
static comedi_driver driver_adl_pci7296 = {
driver_name:"adl_pci7296",
module:THIS_MODULE,
......@@ -72,7 +72,7 @@ static comedi_driver driver_adl_pci7296 = {
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;
comedi_subdevice *s;
......@@ -148,7 +148,7 @@ static int adl_pci7296_attach(comedi_device * dev, comedi_devconfig * it)
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);
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -102,7 +102,7 @@ MODULE_DEVICE_TABLE(pci, pcidio_pci_table);
/* this structure is for data unique to this hardware driver. If
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 {
int data; // curently unused
......@@ -127,8 +127,8 @@ typedef struct {
* the board, and also about the kernel module that contains
* the device code.
*/
static int pcidio_attach(comedi_device * dev, comedi_devconfig * it);
static int pcidio_detach(comedi_device * dev);
static int pcidio_attach(struct comedi_device * dev, comedi_devconfig * it);
static int pcidio_detach(struct comedi_device * dev);
static comedi_driver driver_cb_pcidio = {
driver_name:"cb_pcidio",
module:THIS_MODULE,
......@@ -166,7 +166,7 @@ static comedi_driver driver_cb_pcidio = {
* in the driver structure, dev->board_ptr contains that
* 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;
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
* 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);
if (devpriv) {
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment