Module: xenomai-head
Branch: master
Commit: 212ae5cb11f36cddb055a3d40a1deb34632913f0
URL:
http://git.xenomai.org/?p=xenomai-head.git;a=commit;h=212ae5cb11f36cddb055a3d40a1deb34632913f0
Author: Alexis Berlemont <alexis.berlem...@gmail.com>
Date: Sat May 23 05:17:13 2009 +0200
Change subdevice related callbacks: replace their first argument:
comedi_cxt_t -> comedi_dev_t; the context is meaningless for drivers
developers.
---
include/comedi/buffer.h | 6 +++---
include/comedi/subdevice.h | 18 +++++++++---------
ksrc/drivers/comedi/buffer.c | 6 +++---
ksrc/drivers/comedi/command.c | 14 +++++++-------
ksrc/drivers/comedi/instruction.c | 10 +++++-----
ksrc/drivers/comedi/transfer.c | 2 +-
6 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/include/comedi/buffer.h b/include/comedi/buffer.h
index 7a1d3a1..bac22b3 100644
--- a/include/comedi/buffer.h
+++ b/include/comedi/buffer.h
@@ -144,8 +144,8 @@ static inline int __consume(comedi_cxt_t * cxt,
}
/* Munge procedure */
-static inline void __munge(comedi_cxt_t * cxt,
- void (*munge) (comedi_cxt_t *, int, void *,
+static inline void __munge(struct comedi_device * dev,
+ void (*munge) (struct comedi_device *, int, void *,
unsigned long), int idx_subd,
comedi_buf_t * buf, unsigned long count)
{
@@ -158,7 +158,7 @@ static inline void __munge(comedi_cxt_t * cxt,
buf->size - start_ptr : tmp_cnt;
/* Performs the munge operation */
- munge(cxt, idx_subd, buf->buf + start_ptr, blk_size);
+ munge(dev, idx_subd, buf->buf + start_ptr, blk_size);
/* Updates the start pointer and the count */
tmp_cnt -= blk_size;
diff --git a/include/comedi/subdevice.h b/include/comedi/subdevice.h
index 7cb5cdc..46d14a0 100644
--- a/include/comedi/subdevice.h
+++ b/include/comedi/subdevice.h
@@ -170,23 +170,23 @@ struct comedi_subdevice {
/**< Command capabilities mask */
/* Functions stuff */
- int (*insn_read) (comedi_cxt_t *, comedi_kinsn_t *);
+ int (*insn_read) (struct comedi_subdevice *, comedi_kinsn_t *);
/**< Callback for the
instruction "read" */
- int (*insn_write) (comedi_cxt_t *, comedi_kinsn_t *);
+ int (*insn_write) (struct comedi_subdevice *, comedi_kinsn_t *);
/**< Callback for the
instruction "write" */
- int (*insn_bits) (comedi_cxt_t *, comedi_kinsn_t *);
+ int (*insn_bits) (struct comedi_subdevice *, comedi_kinsn_t *);
/**< Callback for the
instruction "bits" */
- int (*insn_config) (comedi_cxt_t *, comedi_kinsn_t *);
+ int (*insn_config) (struct comedi_subdevice *, comedi_kinsn_t *);
/**< Callback for the
configuration instruction */
- int (*do_cmd) (comedi_cxt_t *, int);
+ int (*do_cmd) (struct comedi_subdevice *, int);
/**< Callback for command handling */
- int (*do_cmdtest) (comedi_cxt_t *, comedi_cmd_t *);
+ int (*do_cmdtest) (struct comedi_subdevice *, comedi_cmd_t *);
/**< Callback for
command checking */
- int (*cancel) (comedi_cxt_t *, int);
+ int (*cancel) (struct comedi_subdevice *, int);
/**< Callback for asynchronous
transfer cancellation */
- void (*munge) (comedi_cxt_t *, int, void *, unsigned long);
+ void (*munge) (struct comedi_device *, int, void *, unsigned long);
/**< Callback
for munge operation */
- int (*trigger) (comedi_cxt_t *, lsampl_t);
+ int (*trigger) (struct comedi_subdevice *, lsampl_t);
/**< Callback for trigger
operation */
char priv[0];
diff --git a/ksrc/drivers/comedi/buffer.c b/ksrc/drivers/comedi/buffer.c
index c339c67..305efd9 100644
--- a/ksrc/drivers/comedi/buffer.c
+++ b/ksrc/drivers/comedi/buffer.c
@@ -508,7 +508,7 @@ int comedi_ioctl_bufinfo(comedi_cxt_t * cxt, void *arg)
/* Performs the munge if need be */
if (dev->transfer->subds[info.idx_subd]->munge != NULL) {
- __munge(cxt,
+ __munge(dev,
dev->transfer->subds[info.idx_subd]->munge,
info.idx_subd, buf, tmp_cnt);
@@ -568,7 +568,7 @@ ssize_t comedi_read(comedi_cxt_t * cxt, void *bufdata,
size_t nbytes)
/* Performs the munge if need be */
if (dev->transfer->subds[idx_subd]->munge != NULL) {
- __munge(cxt,
+ __munge(dev,
dev->transfer->subds[idx_subd]->munge,
idx_subd, buf, tmp_cnt);
@@ -665,7 +665,7 @@ ssize_t comedi_write(comedi_cxt_t *cxt,
/* Performs the munge if need be */
if (dev->transfer->subds[idx_subd]->munge != NULL) {
- __munge(cxt,
+ __munge(dev,
dev->transfer->subds[idx_subd]->munge,
idx_subd, buf, tmp_cnt);
diff --git a/ksrc/drivers/comedi/command.c b/ksrc/drivers/comedi/command.c
index d20b300..3daa449 100644
--- a/ksrc/drivers/comedi/command.c
+++ b/ksrc/drivers/comedi/command.c
@@ -282,9 +282,9 @@ int comedi_ioctl_cmd(comedi_cxt_t * cxt, void *arg)
/* Tests the command with the cmdtest function */
if (dev->transfer->subds[cmd_desc->idx_subd]->do_cmdtest != NULL)
- ret =
- dev->transfer->subds[cmd_desc->idx_subd]->do_cmdtest(cxt,
-
cmd_desc);
+ ret = dev->transfer->subds[cmd_desc->idx_subd]->
+ do_cmdtest(dev->transfer->subds[cmd_desc->idx_subd],
+ cmd_desc);
if (ret != 0)
goto out_ioctl_cmd;
@@ -302,10 +302,10 @@ int comedi_ioctl_cmd(comedi_cxt_t * cxt, void *arg)
comedi_init_transfer(cxt, cmd_desc);
/* Eventually launches the command */
- ret =
- dev->transfer->subds[cmd_desc->idx_subd]->do_cmd(cxt,
- cmd_desc->
- idx_subd);
+ ret = dev->transfer->subds[cmd_desc->idx_subd]->
+ do_cmd(dev->transfer->subds[cmd_desc->idx_subd],
+ cmd_desc->idx_subd);
+
if (ret != 0) {
comedi_cancel_transfer(cxt, cmd_desc->idx_subd);
goto out_ioctl_cmd;
diff --git a/ksrc/drivers/comedi/instruction.c
b/ksrc/drivers/comedi/instruction.c
index 7a061d6..e5c739d 100644
--- a/ksrc/drivers/comedi/instruction.c
+++ b/ksrc/drivers/comedi/instruction.c
@@ -95,7 +95,7 @@ int comedi_do_insn_trig(comedi_cxt_t * cxt, comedi_kinsn_t *
dsc)
return -EINVAL;
/* Performs the trigger */
- return subd->trigger(cxt, dsc->data[0]);;
+ return subd->trigger(subd, dsc->data[0]);
}
int comedi_fill_insndsc(comedi_cxt_t * cxt, comedi_kinsn_t * dsc, void *arg)
@@ -208,16 +208,16 @@ int comedi_do_insn(comedi_cxt_t * cxt, comedi_kinsn_t *
dsc)
/* Lets the driver-specific code perform the instruction */
switch (dsc->type) {
case COMEDI_INSN_READ:
- ret = subd->insn_read(cxt, dsc);
+ ret = subd->insn_read(subd, dsc);
break;
case COMEDI_INSN_WRITE:
- ret = subd->insn_write(cxt, dsc);
+ ret = subd->insn_write(subd, dsc);
break;
case COMEDI_INSN_BITS:
- ret = subd->insn_bits(cxt, dsc);
+ ret = subd->insn_bits(subd, dsc);
break;
case COMEDI_INSN_CONFIG:
- ret = subd->insn_config(cxt, dsc);
+ ret = subd->insn_config(subd, dsc);
break;
default:
ret = -EINVAL;
diff --git a/ksrc/drivers/comedi/transfer.c b/ksrc/drivers/comedi/transfer.c
index b86d3f1..a176be1 100644
--- a/ksrc/drivers/comedi/transfer.c
+++ b/ksrc/drivers/comedi/transfer.c
@@ -256,7 +256,7 @@ int comedi_cancel_transfer(comedi_cxt_t * cxt, int idx_subd)
if a command is under progress; we consider that
the "cancel" function can be used as as to (re)initialize
some component) */
- if (subd->cancel != NULL && (ret = subd->cancel(cxt, idx_subd)) < 0) {
+ if (subd->cancel != NULL && (ret = subd->cancel(subd, idx_subd)) < 0) {
comedi_logerr
("comedi_cancel: subdevice %d cancel handler failed
(ret=%d)\n",
idx_subd, ret);
_______________________________________________
Xenomai-git mailing list
Xenomai-git@gna.org
https://mail.gna.org/listinfo/xenomai-git
