Module: xenomai-head
Branch: master
Commit: 05521ce64e9673d7ca7aa4f827b1c0af5a6db2e1
URL:
http://git.xenomai.org/?p=xenomai-head.git;a=commit;h=05521ce64e9673d7ca7aa4f827b1c0af5a6db2e1
Author: Alexis Berlemont <alexis.berlem...@gmail.com>
Date: Sat May 23 13:54:29 2009 +0200
Review the tracing macros, mimic v4l2's system
---
include/comedi/os_facilities.h | 31 ++++++++++++++---
ksrc/drivers/comedi/buffer.c | 10 +++---
ksrc/drivers/comedi/command.c | 33 +++++++++---------
ksrc/drivers/comedi/device.c | 61 ++++++++++++++++-----------------
ksrc/drivers/comedi/driver.c | 6 ++--
ksrc/drivers/comedi/rtdm_interface.c | 24 +++++++-------
ksrc/drivers/comedi/subdevice.c | 18 +++++-----
ksrc/drivers/comedi/testing/fake.c | 7 ++--
ksrc/drivers/comedi/testing/loop.c | 9 +++--
ksrc/drivers/comedi/transfer.c | 24 +++++++-------
10 files changed, 122 insertions(+), 101 deletions(-)
diff --git a/include/comedi/os_facilities.h b/include/comedi/os_facilities.h
index f4cc85f..b867bdc 100644
--- a/include/comedi/os_facilities.h
+++ b/include/comedi/os_facilities.h
@@ -48,17 +48,38 @@
#define RTDM_SUBCLASS_COMEDI 0
-#define __comedi_logerr(fmt, args...) rtdm_printk(KERN_ERR COMEDI_PROMPT fmt,
##args)
-#define __comedi_loginfo(fmt, args...) rtdm_printk(KERN_INFO COMEDI_PROMPT
fmt, ##args)
+#define __comedi_err(fmt, args...) \
+ rtdm_printk(KERN_ERR COMEDI_PROMPT fmt, ##args)
-#define comedi_logerr(fmt, args...) __comedi_logerr(fmt, ##args)
+#define __comedi_warn(fmt, args...) \
+ rtdm_printk(KERN_WARNING COMEDI_PROMPT fmt, ##args)
#ifdef COMEDI_DEBUG
-#define comedi_loginfo(fmt, args...) __comedi_loginfo(fmt, ##args)
+#define __comedi_info(fmt, args...) \
+ rtdm_printk(KERN_INFO COMEDI_PROMPT fmt, ##args)
#else /* !COMEDI_DEBUG */
-#define comedi_loginfo(fmt, args...)
+#define __comedi_info(fmt, args...)
#endif /* COMEDI_DEBUG */
+#define __comedi_dev_name(dev) \
+ (dev->driver == NULL) ? "unattached dev" : dev->driver->board_name
+
+#define comedi_err(dev, fmt, args...) \
+ __comedi_err("%s: " fmt, __comedi_dev_name, ##args)
+
+#define comedi_warn(dev, fmt, args...) \
+ __comedi_warn("%s: " fmt, __comedi_dev_name, ##args)
+
+#define comedi_info(dev, fmt, args...) \
+ __comedi_info("%s: " fmt, __comedi_dev_name, ##args)
+
+#define comedi_debug(level, debug, dev, fmt, args...) \
+ do { \
+ if (debug >= (level)) \
+ rtdm_printk(KERN_DEBUG COMEDI_PROMPT "%s: " fmt, \
+ __comedi_dev_name, ##args); \
+ } while (0)
+
/* --- Allocation / MMU section --- */
static inline void *comedi_kmalloc(int size)
diff --git a/ksrc/drivers/comedi/buffer.c b/ksrc/drivers/comedi/buffer.c
index 8187042..3377af2 100644
--- a/ksrc/drivers/comedi/buffer.c
+++ b/ksrc/drivers/comedi/buffer.c
@@ -340,7 +340,7 @@ int comedi_ioctl_mmap(comedi_cxt_t * cxt, void *arg)
comedi_mmap_t map_cfg;
comedi_dev_t *dev;
int ret;
- comedi_loginfo("comedi_ioctl_mmap: minor=%d\n", comedi_get_minor(cxt));
+ __comedi_info("comedi_ioctl_mmap: minor=%d\n", comedi_get_minor(cxt));
dev = comedi_get_dev(cxt);
@@ -397,7 +397,7 @@ int comedi_ioctl_bufcfg(comedi_cxt_t * cxt, void *arg)
comedi_dev_t *dev = comedi_get_dev(cxt);
comedi_bufcfg_t buf_cfg;
- comedi_loginfo("comedi_ioctl_bufcfg: minor=%d\n",
+ __comedi_info("comedi_ioctl_bufcfg: minor=%d\n",
comedi_get_minor(cxt));
/* Basic checking */
@@ -445,7 +445,7 @@ int comedi_ioctl_bufinfo(comedi_cxt_t * cxt, void *arg)
unsigned long tmp_cnt;
int ret;
- comedi_loginfo("comedi_ioctl_bufinfo: minor=%d\n",
+ __comedi_info("comedi_ioctl_bufinfo: minor=%d\n",
comedi_get_minor(cxt));
/* Basic checking */
@@ -475,7 +475,7 @@ int comedi_ioctl_bufinfo(comedi_cxt_t * cxt, void *arg)
/* Retrieves the data amount to read */
tmp_cnt = info.rw_count = __count_to_get(buf);
- comedi_loginfo("comedi_ioctl_bufinfo: count to read=%lu\n",
+ __comedi_info("comedi_ioctl_bufinfo: count to read=%lu\n",
tmp_cnt);
if ((ret < 0 && ret != -ENOENT) ||
@@ -506,7 +506,7 @@ int comedi_ioctl_bufinfo(comedi_cxt_t * cxt, void *arg)
/* Retrieves the data amount which is writable */
info.rw_count = __count_to_put(buf);
- comedi_loginfo("comedi_ioctl_bufinfo: count to write=%lu\n",
+ __comedi_info("comedi_ioctl_bufinfo: count to write=%lu\n",
info.rw_count);
} else
diff --git a/ksrc/drivers/comedi/command.c b/ksrc/drivers/comedi/command.c
index 582c8e5..9d25971 100644
--- a/ksrc/drivers/comedi/command.c
+++ b/ksrc/drivers/comedi/command.c
@@ -62,13 +62,13 @@ int comedi_fill_cmddesc(comedi_cxt_t * cxt, comedi_cmd_t *
desc, void *arg)
desc->chan_descs = tmpchans;
- comedi_loginfo("comedi_fill_cmddesc: desc dump\n");
- comedi_loginfo("\t->idx_subd=%u\n", desc->idx_subd);
- comedi_loginfo("\t->flags=%lu\n", desc->flags);
- comedi_loginfo("\t->nb_chan=%u\n", desc->nb_chan);
- comedi_loginfo("\t->chan_descs=0x%x\n", *desc->chan_descs);
- comedi_loginfo("\t->data_len=%u\n", desc->data_len);
- comedi_loginfo("\t->pdata=0x%p\n", desc->data);
+ __comedi_info("comedi_fill_cmddesc: desc dump\n");
+ __comedi_info("\t->idx_subd=%u\n", desc->idx_subd);
+ __comedi_info("\t->flags=%lu\n", desc->flags);
+ __comedi_info("\t->nb_chan=%u\n", desc->nb_chan);
+ __comedi_info("\t->chan_descs=0x%x\n", *desc->chan_descs);
+ __comedi_info("\t->data_len=%u\n", desc->data_len);
+ __comedi_info("\t->pdata=0x%p\n", desc->data);
out_cmddesc:
@@ -92,25 +92,24 @@ int comedi_check_cmddesc(comedi_cxt_t * cxt, comedi_cmd_t *
desc)
int ret = 0;
comedi_dev_t *dev = comedi_get_dev(cxt);
- comedi_loginfo("comedi_check_cmddesc: minor=%d\n",
+ __comedi_info("comedi_check_cmddesc: minor=%d\n",
comedi_get_minor(cxt));
if (desc->idx_subd >= dev->transfer->nb_subd) {
- comedi_logerr
- ("comedi_check_cmddesc: subdevice index out of range (%u >=
%u)\n",
- desc->idx_subd, dev->transfer->nb_subd);
+ __comedi_err("comedi_check_cmddesc: "
+ "subdevice index out of range (%u >= %u)\n",
+ desc->idx_subd, dev->transfer->nb_subd);
return -EINVAL;
}
if (dev->transfer->subds[desc->idx_subd]->flags & COMEDI_SUBD_UNUSED) {
- comedi_logerr
- ("comedi_check_cmddesc: subdevice type incoherent\n");
+ __comedi_err("comedi_check_cmddesc: "
+ "subdevice type incoherent\n");
return -EIO;
}
if (!(dev->transfer->subds[desc->idx_subd]->flags & COMEDI_SUBD_CMD)) {
- comedi_logerr
- ("comedi_check_cmddesc: operation not supported\n");
+ __comedi_err("comedi_check_cmddesc: operation not supported\n");
return -EIO;
}
@@ -118,7 +117,7 @@ int comedi_check_cmddesc(comedi_cxt_t * cxt, comedi_cmd_t *
desc)
return -EBUSY;
if (ret != 0) {
- comedi_logerr("comedi_check_cmddesc: subdevice busy\n");
+ __comedi_err("comedi_check_cmddesc: subdevice busy\n");
return ret;
}
@@ -254,7 +253,7 @@ int comedi_ioctl_cmd(comedi_cxt_t * cxt, void *arg)
comedi_cmd_t *cmd_desc = NULL;
comedi_dev_t *dev = comedi_get_dev(cxt);
- comedi_loginfo("comedi_ioctl_cmd: minor=%d\n", comedi_get_minor(cxt));
+ __comedi_info("comedi_ioctl_cmd: minor=%d\n", comedi_get_minor(cxt));
/* Allocates the command */
cmd_desc = (comedi_cmd_t *) comedi_kmalloc(sizeof(comedi_cmd_t));
diff --git a/ksrc/drivers/comedi/device.c b/ksrc/drivers/comedi/device.c
index bd9fd72..cb413a0 100644
--- a/ksrc/drivers/comedi/device.c
+++ b/ksrc/drivers/comedi/device.c
@@ -121,8 +121,7 @@ int comedi_proc_attach(comedi_cxt_t * cxt)
/* Allocates the buffer for the file name */
entry_name = comedi_kmalloc(COMEDI_NAMELEN + 4);
if ((p = entry_name) == NULL) {
- comedi_logerr
- ("comedi_proc_attach: failed to allocate buffer\n");
+ __comedi_err("comedi_proc_attach: failed to allocate buffer\n");
return -ENOMEM;
}
@@ -133,9 +132,9 @@ int comedi_proc_attach(comedi_cxt_t * cxt)
/* Creates the proc entry */
entry = create_proc_entry(entry_name, 0444, comedi_proc_root);
if (entry == NULL) {
- comedi_logerr
- ("comedi_proc_attach: failed to create /proc/comedi/%s\n",
- entry_name);
+ __comedi_err("comedi_proc_attach: "
+ "failed to create /proc/comedi/%s\n",
+ entry_name);
ret = -ENOMEM;
goto out_setup_proc_transfer;
}
@@ -161,8 +160,8 @@ void comedi_proc_detach(comedi_cxt_t * cxt)
/* Allocates the buffer for the file name */
entry_name = comedi_kmalloc(COMEDI_NAMELEN + 4);
if ((p = entry_name) == NULL) {
- comedi_logerr
- ("comedi_proc_detach: failed to allocate filename
buffer\n");
+ __comedi_err("comedi_proc_detach: "
+ "failed to allocate filename buffer\n");
return;
}
@@ -199,22 +198,22 @@ int comedi_fill_lnkdesc(comedi_cxt_t * cxt,
char *tmpname = NULL;
void *tmpopts = NULL;
- comedi_loginfo("comedi_fill_lnkdesc: minor=%d\n",
+ __comedi_info("comedi_fill_lnkdesc: minor=%d\n",
comedi_get_minor(cxt));
ret = comedi_copy_from_user(cxt,
link_arg, arg, sizeof(comedi_lnkdesc_t));
if (ret != 0) {
- comedi_logerr
- ("comedi_fill_lnkdesc: call1(copy_from_user) failed\n");
+ __comedi_err("comedi_fill_lnkdesc: "
+ "call1(copy_from_user) failed\n");
goto out_get_lnkdesc;
}
if (link_arg->bname_size != 0 && link_arg->bname != NULL) {
tmpname = comedi_kmalloc(link_arg->bname_size + 1);
if (tmpname == NULL) {
- comedi_logerr
- ("comedi_fill_lnkdesc: call1(alloc) failed\n");
+ __comedi_err("comedi_fill_lnkdesc: "
+ "call1(alloc) failed\n");
ret = -ENOMEM;
goto out_get_lnkdesc;
}
@@ -225,12 +224,12 @@ int comedi_fill_lnkdesc(comedi_cxt_t * cxt,
link_arg->bname,
link_arg->bname_size);
if (ret != 0) {
- comedi_logerr
- ("comedi_fill_lnkdesc: call2(copy_from_user)
failed\n");
+ __comedi_err("comedi_fill_lnkdesc: "
+ "call2(copy_from_user) failed\n");
goto out_get_lnkdesc;
}
} else {
- comedi_logerr("comedi_fill_lnkdesc: board name missing\n");
+ __comedi_err("comedi_fill_lnkdesc: board name missing\n");
ret = -EINVAL;
goto out_get_lnkdesc;
}
@@ -239,8 +238,8 @@ int comedi_fill_lnkdesc(comedi_cxt_t * cxt,
tmpopts = comedi_kmalloc(link_arg->opts_size);
if (tmpopts == NULL) {
- comedi_logerr
- ("comedi_fill_lnkdesc: call2(alloc) failed\n");
+ __comedi_err("comedi_fill_lnkdesc: "
+ "call2(alloc) failed\n");
ret = -ENOMEM;
goto out_get_lnkdesc;
}
@@ -250,8 +249,8 @@ int comedi_fill_lnkdesc(comedi_cxt_t * cxt,
link_arg->opts,
link_arg->opts_size);
if (ret != 0) {
- comedi_logerr
- ("comedi_fill_lnkdesc: call3(copy_from_user)
failed\n");
+ __comedi_err("comedi_fill_lnkdesc: "
+ "call3(copy_from_user) failed\n");
goto out_get_lnkdesc;
}
}
@@ -276,7 +275,7 @@ int comedi_fill_lnkdesc(comedi_cxt_t * cxt,
void comedi_free_lnkdesc(comedi_cxt_t * cxt, comedi_lnkdesc_t * link_arg)
{
- comedi_loginfo("comedi_free_lnkdesc: minor=%d\n",
+ __comedi_info("comedi_free_lnkdesc: minor=%d\n",
comedi_get_minor(cxt));
if (link_arg->bname != NULL)
@@ -292,13 +291,13 @@ int comedi_assign_driver(comedi_cxt_t * cxt,
int ret = 0;
comedi_dev_t *dev = comedi_get_dev(cxt);
- comedi_loginfo("comedi_assign_driver: minor=%d\n",
+ __comedi_info("comedi_assign_driver: minor=%d\n",
comedi_get_minor(cxt));
dev->driver = drv;
if (drv->privdata_size == 0)
- comedi_loginfo
+ __comedi_info
("comedi_assign_driver: warning! the field priv will not be
usable\n");
else {
@@ -306,16 +305,16 @@ int comedi_assign_driver(comedi_cxt_t * cxt,
dev->priv = comedi_kmalloc(drv->privdata_size);
if (dev->priv == NULL && drv->privdata_size != 0) {
- comedi_logerr
- ("comedi_assign_driver: call(alloc) failed\n");
+ __comedi_err("comedi_assign_driver: "
+ "call(alloc) failed\n");
ret = -ENOMEM;
goto out_assign_driver;
}
}
if ((ret = drv->attach(dev, link_arg)) != 0)
- comedi_logerr
- ("comedi_assign_driver: call(drv->attach) failed
(ret=%d)\n",
+ __comedi_err("comedi_assign_driver: "
+ "call(drv->attach) failed (ret=%d)\n",
ret);
out_assign_driver:
@@ -338,7 +337,7 @@ int comedi_release_driver(comedi_cxt_t * cxt)
unsigned long flags;
comedi_dev_t *dev = comedi_get_dev(cxt);
- comedi_loginfo("comedi_release_driver: minor=%d\n",
+ __comedi_info("comedi_release_driver: minor=%d\n",
comedi_get_minor(cxt));
comedi_lock_irqsave(&dev->lock, flags);
@@ -375,7 +374,7 @@ int comedi_device_attach(comedi_cxt_t * cxt, void *arg)
comedi_lnkdesc_t link_arg;
comedi_drv_t *drv = NULL;
- comedi_loginfo("comedi_device_attach: minor=%d\n",
+ __comedi_info("comedi_device_attach: minor=%d\n",
comedi_get_minor(cxt));
if ((ret = comedi_fill_lnkdesc(cxt, &link_arg, arg)) != 0)
@@ -396,7 +395,7 @@ int comedi_device_detach(comedi_cxt_t * cxt)
{
comedi_dev_t *dev = comedi_get_dev(cxt);
- comedi_loginfo("comedi_device_detach: minor=%d\n",
+ __comedi_info("comedi_device_detach: minor=%d\n",
comedi_get_minor(cxt));
if (dev->driver == NULL)
@@ -411,7 +410,7 @@ int comedi_ioctl_devcfg(comedi_cxt_t * cxt, void *arg)
{
int ret = 0;
- comedi_loginfo("comedi_ioctl_devcfg: minor=%d\n",
+ __comedi_info("comedi_ioctl_devcfg: minor=%d\n",
comedi_get_minor(cxt));
if (comedi_test_rt() != 0)
@@ -457,7 +456,7 @@ int comedi_ioctl_devinfo(comedi_cxt_t * cxt, void *arg)
comedi_dvinfo_t info;
comedi_dev_t *dev = comedi_get_dev(cxt);
- comedi_loginfo("comedi_ioctl_devinfo: minor=%d\n",
+ __comedi_info("comedi_ioctl_devinfo: minor=%d\n",
comedi_get_minor(cxt));
memset(&info, 0, sizeof(comedi_dvinfo_t));
diff --git a/ksrc/drivers/comedi/driver.c b/ksrc/drivers/comedi/driver.c
index 5ff934c..3907ec7 100644
--- a/ksrc/drivers/comedi/driver.c
+++ b/ksrc/drivers/comedi/driver.c
@@ -40,7 +40,7 @@ int comedi_lct_drv(char *pin, comedi_drv_t ** pio)
struct list_head *this;
int ret = -EINVAL;
- comedi_loginfo("comedi_lct_drv: name=%s\n", pin);
+ __comedi_info("comedi_lct_drv: name=%s\n", pin);
/* Goes through the linked list so as to find
a driver instance with the same name */
@@ -62,7 +62,7 @@ int comedi_lct_drv(char *pin, comedi_drv_t ** pio)
int comedi_register_drv(comedi_drv_t * drv)
{
- comedi_loginfo("comedi_add_drv: name=%s\n", drv->board_name);
+ __comedi_info("comedi_add_drv: name=%s\n", drv->board_name);
if (comedi_lct_drv(drv->board_name, NULL) != 0) {
list_add(&drv->list, &comedi_drvs);
@@ -73,7 +73,7 @@ int comedi_register_drv(comedi_drv_t * drv)
int comedi_unregister_drv(comedi_drv_t * drv)
{
- comedi_loginfo("comedi_rm_drv: name=%s\n", drv->board_name);
+ __comedi_info("comedi_rm_drv: name=%s\n", drv->board_name);
if (comedi_lct_drv(drv->board_name, NULL) == 0) {
/* Here, we consider the argument is pointing
diff --git a/ksrc/drivers/comedi/rtdm_interface.c
b/ksrc/drivers/comedi/rtdm_interface.c
index 73687b6..5e2ef92 100644
--- a/ksrc/drivers/comedi/rtdm_interface.c
+++ b/ksrc/drivers/comedi/rtdm_interface.c
@@ -60,16 +60,16 @@ int comedi_init_proc(void)
/* Creates the global directory */
comedi_proc_root = create_proc_entry("comedi", S_IFDIR, 0);
if (comedi_proc_root == NULL) {
- comedi_logerr
- ("comedi_proc_init: failed to create /proc/comedi\n");
+ __comedi_err("comedi_proc_init: "
+ "failed to create /proc/comedi\n");
return -ENOMEM;
}
/* Creates the devices related file */
entry = create_proc_entry("devices", 0444, comedi_proc_root);
if (entry == NULL) {
- comedi_logerr
- ("comedi_proc_init: failed to create
/proc/comedi/devices\n");
+ __comedi_err("comedi_proc_init: "
+ "failed to create /proc/comedi/devices\n");
ret = -ENOMEM;
goto err_proc_init;
}
@@ -83,8 +83,8 @@ int comedi_init_proc(void)
/* Creates the drivers related file */
entry = create_proc_entry("drivers", 0444, comedi_proc_root);
if (entry == NULL) {
- comedi_logerr
- ("comedi_proc_init: failed to create
/proc/comedi/drivers\n");
+ __comedi_err("comedi_proc_init: "
+ "failed to create /proc/comedi/drivers\n");
ret = -ENOMEM;
goto err_proc_init;
}
@@ -124,7 +124,7 @@ int comedi_rt_open(struct rtdm_dev_context *context,
comedi_init_cxt(context, user_info, &cxt);
comedi_set_dev(&cxt);
- comedi_loginfo("comedi_rt_open: minor=%d\n", comedi_get_minor(&cxt));
+ __comedi_info("comedi_rt_open: minor=%d\n", comedi_get_minor(&cxt));
return 0;
}
@@ -136,7 +136,7 @@ int comedi_rt_close(struct rtdm_dev_context *context,
comedi_init_cxt(context, user_info, &cxt);
comedi_set_dev(&cxt);
- comedi_loginfo("comedi_rt_close: minor=%d\n", comedi_get_minor(&cxt));
+ __comedi_info("comedi_rt_close: minor=%d\n", comedi_get_minor(&cxt));
return 0;
}
@@ -151,7 +151,7 @@ ssize_t comedi_rt_read(struct rtdm_dev_context * context,
comedi_set_dev(&cxt);
dev = comedi_get_dev(&cxt);
- comedi_loginfo("comedi_rt_read: minor=%d\n", comedi_get_minor(&cxt));
+ __comedi_info("comedi_rt_read: minor=%d\n", comedi_get_minor(&cxt));
if (nbytes == 0)
return 0;
@@ -170,7 +170,7 @@ ssize_t comedi_rt_write(struct rtdm_dev_context * context,
comedi_set_dev(&cxt);
dev = comedi_get_dev(&cxt);
- comedi_loginfo("comedi_rt_write: minor=%d\n", comedi_get_minor(&cxt));
+ __comedi_info("comedi_rt_write: minor=%d\n", comedi_get_minor(&cxt));
if (nbytes == 0)
return 0;
@@ -186,7 +186,7 @@ int comedi_rt_ioctl(struct rtdm_dev_context *context,
comedi_init_cxt(context, user_info, &cxt);
comedi_set_dev(&cxt);
- comedi_loginfo("comedi_rt_ioctl: minor=%d\n", comedi_get_minor(&cxt));
+ __comedi_info("comedi_rt_ioctl: minor=%d\n", comedi_get_minor(&cxt));
return comedi_ioctl_functions[_IOC_NR(request)] (&cxt, arg);
}
@@ -202,7 +202,7 @@ int comedi_rt_select(struct rtdm_dev_context *context,
called */
comedi_init_cxt(context, NULL, &cxt);
comedi_set_dev(&cxt);
- comedi_loginfo("comedi_rt_select: minor=%d\n", comedi_get_minor(&cxt));
+ __comedi_info("comedi_rt_select: minor=%d\n", comedi_get_minor(&cxt));
return comedi_select(&cxt, selector, type, fd_index);
}
diff --git a/ksrc/drivers/comedi/subdevice.c b/ksrc/drivers/comedi/subdevice.c
index 2fccf00..ed11f5b 100644
--- a/ksrc/drivers/comedi/subdevice.c
+++ b/ksrc/drivers/comedi/subdevice.c
@@ -90,23 +90,23 @@ int comedi_check_chanlist(comedi_subd_t * subd,
COMEDI_CHAN_GLOBAL_CHANDESC) ? i : 0;
if (CR_CHAN(chans[i]) >= subd->chan_desc->length) {
- comedi_logerr
- ("comedi_check_chanlist: chan idx out_of range
(%u>=%lu)\n",
- CR_CHAN(chans[i]), subd->chan_desc->length);
+ __comedi_err("comedi_check_chanlist: "
+ "chan idx out_of range (%u>=%lu)\n",
+ CR_CHAN(chans[i]),
subd->chan_desc->length);
return -EINVAL;
}
if (CR_RNG(chans[i]) > subd->rng_desc->rngtabs[j]->length) {
- comedi_logerr
- ("comedi_check_chanlist: rng idx out_of range
(%u>=%u)\n",
- CR_RNG(chans[i]),
- subd->rng_desc->rngtabs[j]->length);
+ __comedi_err("comedi_check_chanlist: "
+ "rng idx out_of range (%u>=%u)\n",
+ CR_RNG(chans[i]),
+ subd->rng_desc->rngtabs[j]->length);
return -EINVAL;
}
if (CR_AREF(chans[i]) != 0 &&
(CR_AREF(chans[i]) & subd->chan_desc->chans[k].flags) == 0)
{
- comedi_logerr
- ("comedi_check_chanlist: bad channel type\n");
+ __comedi_err("comedi_check_chanlist: "
+ "bad channel type\n");
return -EINVAL;
}
}
diff --git a/ksrc/drivers/comedi/testing/fake.c
b/ksrc/drivers/comedi/testing/fake.c
index c4eda62..8120368 100644
--- a/ksrc/drivers/comedi/testing/fake.c
+++ b/ksrc/drivers/comedi/testing/fake.c
@@ -152,14 +152,15 @@ int test_cmd(comedi_subd_t *subd, comedi_cmd_t *cmd)
comedi_dev_t *dev = subd->dev;
tstprv_t *priv = (tstprv_t *)dev->priv;
- comedi_loginfo("test_cmd: begin (subd=%d)\n",idx_subd);
+ comedi_info(dev, "test_cmd: begin (subd=%d)\n",idx_subd);
priv->scan_period_ns=cmd->scan_begin_arg;
priv->convert_period_ns=(cmd->convert_src==TRIG_TIMER)?
cmd->convert_arg:0;
- comedi_loginfo("test_cmd: scan_period=%luns convert_period=%luns\n",
- priv->scan_period_ns, priv->convert_period_ns);
+ comedi_info(dev,
+ "test_cmd: scan_period=%luns convert_period=%luns\n",
+ priv->scan_period_ns, priv->convert_period_ns);
priv->last_ns = comedi_get_time();
diff --git a/ksrc/drivers/comedi/testing/loop.c
b/ksrc/drivers/comedi/testing/loop.c
index 8beafb2..77dbaf8 100644
--- a/ksrc/drivers/comedi/testing/loop.c
+++ b/ksrc/drivers/comedi/testing/loop.c
@@ -78,8 +78,9 @@ static void loop_task_proc(void *arg)
if (ret == 0) {
- comedi_loginfo("loop_task_proc: "
- "data available\n");
+ comedi_info(dev,
+ "loop_task_proc: "
+ "data available\n");
comedi_buf_evt(dev, COMEDI_BUF_GET, 0);
@@ -106,7 +107,7 @@ int loop_cmd(comedi_subd_t *subd, comedi_cmd_t *cmd)
{
lpprv_t *priv = (lpprv_t *)subd->dev->priv;
- comedi_loginfo("loop_cmd: (subd=%d)\n",idx_subd);
+ comedi_info(dev, "loop_cmd: (subd=%d)\n",idx_subd);
priv->loop_running = 1;
@@ -119,7 +120,7 @@ int loop_cancel(comedi_subd_t *subd, int idx_subd)
{
lpprv_t *priv=(lpprv_t *)subd->dev->priv;
- comedi_loginfo("loop_cancel: (subd=%d)\n",idx_subd);
+ comedi_info(dev, "loop_cancel: (subd=%d)\n",idx_subd);
priv->loop_running=0;
diff --git a/ksrc/drivers/comedi/transfer.c b/ksrc/drivers/comedi/transfer.c
index a176be1..c0d7faf 100644
--- a/ksrc/drivers/comedi/transfer.c
+++ b/ksrc/drivers/comedi/transfer.c
@@ -39,7 +39,7 @@ int comedi_cleanup_transfer(comedi_cxt_t * cxt)
comedi_trf_t *tsf;
int i;
- comedi_loginfo("comedi_cleanup_transfer: minor=%d\n",
+ __comedi_info("comedi_cleanup_transfer: minor=%d\n",
comedi_get_minor(cxt));
dev = comedi_get_dev(cxt);
@@ -90,7 +90,7 @@ int comedi_setup_transfer(comedi_cxt_t * cxt)
struct list_head *this;
int i = 0, ret = 0;
- comedi_loginfo("comedi_setup_transfer: minor=%d\n",
+ __comedi_info("comedi_setup_transfer: minor=%d\n",
comedi_get_minor(cxt));
dev = comedi_get_dev(cxt);
@@ -98,7 +98,7 @@ int comedi_setup_transfer(comedi_cxt_t * cxt)
/* Allocates the main structure */
tsf = comedi_kmalloc(sizeof(comedi_trf_t));
if (tsf == NULL) {
- comedi_logerr("comedi_setup_transfer: call1(alloc) failed \n");
+ __comedi_err("comedi_setup_transfer: call1(alloc) failed \n");
return -ENOMEM;
}
memset(tsf, 0, sizeof(comedi_trf_t));
@@ -122,7 +122,7 @@ int comedi_setup_transfer(comedi_cxt_t * cxt)
/* Allocates a suitable tab for the subdevices */
tsf->subds = comedi_kmalloc(tsf->nb_subd * sizeof(comedi_subd_t *));
if (tsf->subds == NULL) {
- comedi_logerr("comedi_setup_transfer: call2(alloc) failed \n");
+ __comedi_err("comedi_setup_transfer: call2(alloc) failed \n");
ret = -ENOMEM;
goto out_setup_tsf;
}
@@ -152,8 +152,8 @@ int comedi_setup_transfer(comedi_cxt_t * cxt)
if (tsf->subds[i]->flags & COMEDI_SUBD_CMD) {
tsf->bufs[i] = comedi_kmalloc(sizeof(comedi_buf_t));
if (tsf->bufs[i] == NULL) {
- comedi_logerr
- ("comedi_setup_transfer: call5-6(alloc)
failed \n");
+ __comedi_err("comedi_setup_transfer: "
+ "call5-6(alloc) failed \n");
ret = -ENOMEM;
goto out_setup_tsf;
}
@@ -168,7 +168,7 @@ int comedi_setup_transfer(comedi_cxt_t * cxt)
tsf->status = comedi_kmalloc(tsf->nb_subd * sizeof(unsigned long));
if (tsf->status == NULL) {
- comedi_logerr("comedi_setup_transfer: call8(alloc) failed \n");
+ __comedi_err("comedi_setup_transfer: call8(alloc) failed \n");
ret = -ENOMEM;
}
@@ -186,7 +186,7 @@ int comedi_reserve_transfer(comedi_cxt_t * cxt, int
idx_subd)
{
comedi_dev_t *dev = comedi_get_dev(cxt);
- comedi_loginfo("comedi_reserve_transfer: minor=%d idx=%d\n",
+ __comedi_info("comedi_reserve_transfer: minor=%d idx=%d\n",
comedi_get_minor(cxt), idx_subd);
if (test_and_set_bit(COMEDI_TSF_BUSY,
@@ -201,7 +201,7 @@ int comedi_init_transfer(comedi_cxt_t * cxt, comedi_cmd_t *
cmd)
int i;
comedi_dev_t *dev = comedi_get_dev(cxt);
- comedi_loginfo("comedi_init_transfer: minor=%d idx=%d\n",
+ __comedi_info("comedi_init_transfer: minor=%d idx=%d\n",
comedi_get_minor(cxt), cmd->idx_subd);
/* Checks if the transfer system has to work in bulk mode */
@@ -257,9 +257,9 @@ int comedi_cancel_transfer(comedi_cxt_t * cxt, int idx_subd)
the "cancel" function can be used as as to (re)initialize
some component) */
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);
+ __comedi_err("comedi_cancel: "
+ "subdevice %d cancel handler failed (ret=%d)\n",
+ idx_subd, ret);
}
/* Clears the "busy" flag */
_______________________________________________
Xenomai-git mailing list
Xenomai-git@gna.org
https://mail.gna.org/listinfo/xenomai-git
