Module: xenomai-abe Branch: analogy Commit: c51da9c557ec9fcca82db489c8ecabc290994227 URL: http://git.xenomai.org/?p=xenomai-abe.git;a=commit;h=c51da9c557ec9fcca82db489c8ecabc290994227
Author: Alexis Berlemont <alexis.berlem...@gmail.com> Date: Wed Apr 21 01:02:17 2010 +0200 analogy: in the core, call rtdm_in_rt_context() instead of a4l_test_rt() --- ksrc/drivers/analogy/buffer.c | 13 +++++++------ ksrc/drivers/analogy/device.c | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/ksrc/drivers/analogy/buffer.c b/ksrc/drivers/analogy/buffer.c index 3ec558a..d882810 100644 --- a/ksrc/drivers/analogy/buffer.c +++ b/ksrc/drivers/analogy/buffer.c @@ -400,7 +400,7 @@ int a4l_ioctl_mmap(a4l_cxt_t *cxt, void *arg) /* The mmap operation cannot be performed in a real-time context */ - if (a4l_test_rt() != 0) { + if (rtdm_in_rt_context() != 0) { return -ENOSYS; } @@ -475,7 +475,7 @@ int a4l_ioctl_bufcfg(a4l_cxt_t * cxt, void *arg) /* As Linux API is used to allocate a virtual buffer, the calling process must not be in primary mode */ - if (a4l_test_rt() != 0) { + if (rtdm_in_rt_context() != 0) { return -ENOSYS; } @@ -730,7 +730,7 @@ ssize_t a4l_read(a4l_cxt_t * cxt, void *bufdata, size_t nbytes) /* If the acquisition is not over, we must not leave the function without having read a least byte */ else { - ret = a4l_wait_sync(&(buf->sync), a4l_test_rt()); + ret = a4l_wait_sync(&(buf->sync), rtdm_in_rt_context()); if (ret < 0) { if (ret == -ERESTARTSYS) ret = -EINTR; @@ -823,7 +823,7 @@ ssize_t a4l_write(a4l_cxt_t *cxt, goto out_a4l_write; } else { /* The buffer is full, we have to wait for a slot to free */ - ret = a4l_wait_sync(&(buf->sync), a4l_test_rt()); + ret = a4l_wait_sync(&(buf->sync), rtdm_in_rt_context()); if (ret < 0) { if (ret == -ERESTARTSYS) ret = -EINTR; @@ -953,11 +953,12 @@ int a4l_ioctl_poll(a4l_cxt_t * cxt, void *arg) goto out_poll; if (poll.arg == A4L_INFINITE) - ret = a4l_wait_sync(&(buf->sync), a4l_test_rt()); + ret = a4l_wait_sync(&(buf->sync), rtdm_in_rt_context()); else { unsigned long long ns = ((unsigned long long)poll.arg) * ((unsigned long long)NSEC_PER_MSEC); - ret = a4l_timedwait_sync(&(buf->sync), a4l_test_rt(), ns); + ret = a4l_timedwait_sync(&(buf->sync), + rtdm_in_rt_context(), ns); } if (ret == 0) { diff --git a/ksrc/drivers/analogy/device.c b/ksrc/drivers/analogy/device.c index ec40b95..a840ada 100644 --- a/ksrc/drivers/analogy/device.c +++ b/ksrc/drivers/analogy/device.c @@ -427,7 +427,7 @@ int a4l_ioctl_devcfg(a4l_cxt_t * cxt, void *arg) __a4l_dbg(1, core_dbg, "a4l_ioctl_devcfg: minor=%d\n", a4l_get_minor(cxt)); - if (a4l_test_rt() != 0) + if (rtdm_in_rt_context() != 0) return -ENOSYS; if (arg == NULL) { _______________________________________________ Xenomai-git mailing list Xenomai-git@gna.org https://mail.gna.org/listinfo/xenomai-git