[Xenomai-git] Gilles Chanteperdrix : drivers/testing: adapt switchtest after RTDM changes
Module: xenomai-forge
Branch: next
Commit: 96e2423ae582c806fc57fe21cbf76a7d8c592413
URL:
http://git.xenomai.org/?p=xenomai-forge.git;a=commit;h=96e2423ae582c806fc57fe21cbf76a7d8c592413
Author: Gilles Chanteperdrix gilles.chanteperd...@xenomai.org
Date: Sat Feb 1 20:29:54 2014 +0100
drivers/testing: adapt switchtest after RTDM changes
---
kernel/drivers/testing/switchtest.c | 111 ++-
1 file changed, 45 insertions(+), 66 deletions(-)
diff --git a/kernel/drivers/testing/switchtest.c
b/kernel/drivers/testing/switchtest.c
index 067457c..cba8811 100644
--- a/kernel/drivers/testing/switchtest.c
+++ b/kernel/drivers/testing/switchtest.c
@@ -511,11 +511,9 @@ static void rtswitch_utask_waker(rtdm_nrtsig_t sig, void
*arg)
up(ctx-utask-nrt_synch);
}
-static int rtswitch_open(struct rtdm_dev_context *context,
-rtdm_user_info_t *user_info,
-int oflags)
+static int rtswitch_open(struct rtdm_fd *context, int oflags)
{
- rtswitch_context_t *ctx = (rtswitch_context_t *) context-dev_private;
+ rtswitch_context_t *ctx = rtdm_context_to_private(context);
int err;
ctx-tasks = NULL;
@@ -534,10 +532,9 @@ static int rtswitch_open(struct rtdm_dev_context *context,
return 0;
}
-static int rtswitch_close(struct rtdm_dev_context *context,
- rtdm_user_info_t *user_info)
+static void rtswitch_close(struct rtdm_fd *context)
{
- rtswitch_context_t *ctx = (rtswitch_context_t *) context-dev_private;
+ rtswitch_context_t *ctx = rtdm_context_to_private(context);
unsigned i;
if (ctx-tasks) {
@@ -556,16 +553,13 @@ static int rtswitch_close(struct rtdm_dev_context
*context,
}
rtdm_timer_destroy(ctx-wake_up_delay);
rtdm_nrtsig_destroy(ctx-wake_utask);
-
- return 0;
}
-static int rtswitch_ioctl_nrt(struct rtdm_dev_context *context,
- rtdm_user_info_t *user_info,
+static int rtswitch_ioctl_nrt(struct rtdm_fd *context,
unsigned int request,
void *arg)
{
- rtswitch_context_t *ctx = (rtswitch_context_t *) context-dev_private;
+ rtswitch_context_t *ctx = rtdm_context_to_private(context);
struct rttst_swtest_task task;
struct rttst_swtest_dir fromto;
unsigned long count;
@@ -588,15 +582,15 @@ static int rtswitch_ioctl_nrt(struct rtdm_dev_context
*context,
return 0;
case RTTST_RTIOC_SWTEST_REGISTER_UTASK:
- if (!rtdm_rw_user_ok(user_info, arg, sizeof(task)))
+ if (!rtdm_rw_user_ok(context, arg, sizeof(task)))
return -EFAULT;
- rtdm_copy_from_user(user_info, task, arg, sizeof(task));
+ rtdm_copy_from_user(context, task, arg, sizeof(task));
err = rtswitch_register_task(ctx, task);
if (!err)
- rtdm_copy_to_user(user_info,
+ rtdm_copy_to_user(context,
arg,
task,
sizeof(task));
@@ -604,15 +598,15 @@ static int rtswitch_ioctl_nrt(struct rtdm_dev_context
*context,
return err;
case RTTST_RTIOC_SWTEST_CREATE_KTASK:
- if (!rtdm_rw_user_ok(user_info, arg, sizeof(task)))
+ if (!rtdm_rw_user_ok(context, arg, sizeof(task)))
return -EFAULT;
- rtdm_copy_from_user(user_info, task, arg, sizeof(task));
+ rtdm_copy_from_user(context, task, arg, sizeof(task));
err = rtswitch_create_ktask(ctx, task);
if (!err)
- rtdm_copy_to_user(user_info,
+ rtdm_copy_to_user(context,
arg,
task,
sizeof(task));
@@ -620,18 +614,18 @@ static int rtswitch_ioctl_nrt(struct rtdm_dev_context
*context,
return err;
case RTTST_RTIOC_SWTEST_PEND:
- if (!rtdm_read_user_ok(user_info, arg, sizeof(task)))
+ if (!rtdm_read_user_ok(context, arg, sizeof(task)))
return -EFAULT;
- rtdm_copy_from_user(user_info, task, arg, sizeof(task));
+ rtdm_copy_from_user(context, task, arg, sizeof(task));
return rtswitch_pend_nrt(ctx, task.index);
case RTTST_RTIOC_SWTEST_SWITCH_TO:
- if (!rtdm_read_user_ok(user_info, arg, sizeof(fromto)))
+ if (!rtdm_read_user_ok(context, arg, sizeof(fromto)))
return -EFAULT;
- rtdm_copy_from_user(user_info,
+ rtdm_copy_from_user(context,
fromto,
[Xenomai-git] Gilles Chanteperdrix : drivers/testing: adapt switchtest after RTDM changes
Module: xenomai-forge
Branch: master
Commit: 96e2423ae582c806fc57fe21cbf76a7d8c592413
URL:
http://git.xenomai.org/?p=xenomai-forge.git;a=commit;h=96e2423ae582c806fc57fe21cbf76a7d8c592413
Author: Gilles Chanteperdrix gilles.chanteperd...@xenomai.org
Date: Sat Feb 1 20:29:54 2014 +0100
drivers/testing: adapt switchtest after RTDM changes
---
kernel/drivers/testing/switchtest.c | 111 ++-
1 file changed, 45 insertions(+), 66 deletions(-)
diff --git a/kernel/drivers/testing/switchtest.c
b/kernel/drivers/testing/switchtest.c
index 067457c..cba8811 100644
--- a/kernel/drivers/testing/switchtest.c
+++ b/kernel/drivers/testing/switchtest.c
@@ -511,11 +511,9 @@ static void rtswitch_utask_waker(rtdm_nrtsig_t sig, void
*arg)
up(ctx-utask-nrt_synch);
}
-static int rtswitch_open(struct rtdm_dev_context *context,
-rtdm_user_info_t *user_info,
-int oflags)
+static int rtswitch_open(struct rtdm_fd *context, int oflags)
{
- rtswitch_context_t *ctx = (rtswitch_context_t *) context-dev_private;
+ rtswitch_context_t *ctx = rtdm_context_to_private(context);
int err;
ctx-tasks = NULL;
@@ -534,10 +532,9 @@ static int rtswitch_open(struct rtdm_dev_context *context,
return 0;
}
-static int rtswitch_close(struct rtdm_dev_context *context,
- rtdm_user_info_t *user_info)
+static void rtswitch_close(struct rtdm_fd *context)
{
- rtswitch_context_t *ctx = (rtswitch_context_t *) context-dev_private;
+ rtswitch_context_t *ctx = rtdm_context_to_private(context);
unsigned i;
if (ctx-tasks) {
@@ -556,16 +553,13 @@ static int rtswitch_close(struct rtdm_dev_context
*context,
}
rtdm_timer_destroy(ctx-wake_up_delay);
rtdm_nrtsig_destroy(ctx-wake_utask);
-
- return 0;
}
-static int rtswitch_ioctl_nrt(struct rtdm_dev_context *context,
- rtdm_user_info_t *user_info,
+static int rtswitch_ioctl_nrt(struct rtdm_fd *context,
unsigned int request,
void *arg)
{
- rtswitch_context_t *ctx = (rtswitch_context_t *) context-dev_private;
+ rtswitch_context_t *ctx = rtdm_context_to_private(context);
struct rttst_swtest_task task;
struct rttst_swtest_dir fromto;
unsigned long count;
@@ -588,15 +582,15 @@ static int rtswitch_ioctl_nrt(struct rtdm_dev_context
*context,
return 0;
case RTTST_RTIOC_SWTEST_REGISTER_UTASK:
- if (!rtdm_rw_user_ok(user_info, arg, sizeof(task)))
+ if (!rtdm_rw_user_ok(context, arg, sizeof(task)))
return -EFAULT;
- rtdm_copy_from_user(user_info, task, arg, sizeof(task));
+ rtdm_copy_from_user(context, task, arg, sizeof(task));
err = rtswitch_register_task(ctx, task);
if (!err)
- rtdm_copy_to_user(user_info,
+ rtdm_copy_to_user(context,
arg,
task,
sizeof(task));
@@ -604,15 +598,15 @@ static int rtswitch_ioctl_nrt(struct rtdm_dev_context
*context,
return err;
case RTTST_RTIOC_SWTEST_CREATE_KTASK:
- if (!rtdm_rw_user_ok(user_info, arg, sizeof(task)))
+ if (!rtdm_rw_user_ok(context, arg, sizeof(task)))
return -EFAULT;
- rtdm_copy_from_user(user_info, task, arg, sizeof(task));
+ rtdm_copy_from_user(context, task, arg, sizeof(task));
err = rtswitch_create_ktask(ctx, task);
if (!err)
- rtdm_copy_to_user(user_info,
+ rtdm_copy_to_user(context,
arg,
task,
sizeof(task));
@@ -620,18 +614,18 @@ static int rtswitch_ioctl_nrt(struct rtdm_dev_context
*context,
return err;
case RTTST_RTIOC_SWTEST_PEND:
- if (!rtdm_read_user_ok(user_info, arg, sizeof(task)))
+ if (!rtdm_read_user_ok(context, arg, sizeof(task)))
return -EFAULT;
- rtdm_copy_from_user(user_info, task, arg, sizeof(task));
+ rtdm_copy_from_user(context, task, arg, sizeof(task));
return rtswitch_pend_nrt(ctx, task.index);
case RTTST_RTIOC_SWTEST_SWITCH_TO:
- if (!rtdm_read_user_ok(user_info, arg, sizeof(fromto)))
+ if (!rtdm_read_user_ok(context, arg, sizeof(fromto)))
return -EFAULT;
- rtdm_copy_from_user(user_info,
+ rtdm_copy_from_user(context,
fromto,
[Xenomai-git] Gilles Chanteperdrix : drivers/testing: adapt switchtest after RTDM changes
Module: xenomai-gch
Branch: for-forge
Commit: 1c9b524b7917ea8260f52cdbe5e56e084171a5f3
URL:
http://git.xenomai.org/?p=xenomai-gch.git;a=commit;h=1c9b524b7917ea8260f52cdbe5e56e084171a5f3
Author: Gilles Chanteperdrix gilles.chanteperd...@xenomai.org
Date: Sat Feb 1 20:29:54 2014 +0100
drivers/testing: adapt switchtest after RTDM changes
---
kernel/drivers/testing/switchtest.c | 111 ++-
1 file changed, 45 insertions(+), 66 deletions(-)
diff --git a/kernel/drivers/testing/switchtest.c
b/kernel/drivers/testing/switchtest.c
index 4523917..668ee17 100644
--- a/kernel/drivers/testing/switchtest.c
+++ b/kernel/drivers/testing/switchtest.c
@@ -511,11 +511,9 @@ static void rtswitch_utask_waker(rtdm_nrtsig_t sig, void
*arg)
up(ctx-utask-nrt_synch);
}
-static int rtswitch_open(struct rtdm_dev_context *context,
-rtdm_user_info_t *user_info,
-int oflags)
+static int rtswitch_open(struct xnfd *context, int oflags)
{
- rtswitch_context_t *ctx = (rtswitch_context_t *) context-dev_private;
+ rtswitch_context_t *ctx = rtdm_context_to_private(context);
int err;
ctx-tasks = NULL;
@@ -534,10 +532,9 @@ static int rtswitch_open(struct rtdm_dev_context *context,
return 0;
}
-static int rtswitch_close(struct rtdm_dev_context *context,
- rtdm_user_info_t *user_info)
+static void rtswitch_close(struct xnfd *context)
{
- rtswitch_context_t *ctx = (rtswitch_context_t *) context-dev_private;
+ rtswitch_context_t *ctx = rtdm_context_to_private(context);
unsigned i;
if (ctx-tasks) {
@@ -556,16 +553,13 @@ static int rtswitch_close(struct rtdm_dev_context
*context,
}
rtdm_timer_destroy(ctx-wake_up_delay);
rtdm_nrtsig_destroy(ctx-wake_utask);
-
- return 0;
}
-static int rtswitch_ioctl_nrt(struct rtdm_dev_context *context,
- rtdm_user_info_t *user_info,
+static int rtswitch_ioctl_nrt(struct xnfd *context,
unsigned int request,
void *arg)
{
- rtswitch_context_t *ctx = (rtswitch_context_t *) context-dev_private;
+ rtswitch_context_t *ctx = rtdm_context_to_private(context);
struct rttst_swtest_task task;
struct rttst_swtest_dir fromto;
unsigned long count;
@@ -588,15 +582,15 @@ static int rtswitch_ioctl_nrt(struct rtdm_dev_context
*context,
return 0;
case RTTST_RTIOC_SWTEST_REGISTER_UTASK:
- if (!rtdm_rw_user_ok(user_info, arg, sizeof(task)))
+ if (!rtdm_rw_user_ok(context, arg, sizeof(task)))
return -EFAULT;
- rtdm_copy_from_user(user_info, task, arg, sizeof(task));
+ rtdm_copy_from_user(context, task, arg, sizeof(task));
err = rtswitch_register_task(ctx, task);
if (!err)
- rtdm_copy_to_user(user_info,
+ rtdm_copy_to_user(context,
arg,
task,
sizeof(task));
@@ -604,15 +598,15 @@ static int rtswitch_ioctl_nrt(struct rtdm_dev_context
*context,
return err;
case RTTST_RTIOC_SWTEST_CREATE_KTASK:
- if (!rtdm_rw_user_ok(user_info, arg, sizeof(task)))
+ if (!rtdm_rw_user_ok(context, arg, sizeof(task)))
return -EFAULT;
- rtdm_copy_from_user(user_info, task, arg, sizeof(task));
+ rtdm_copy_from_user(context, task, arg, sizeof(task));
err = rtswitch_create_ktask(ctx, task);
if (!err)
- rtdm_copy_to_user(user_info,
+ rtdm_copy_to_user(context,
arg,
task,
sizeof(task));
@@ -620,18 +614,18 @@ static int rtswitch_ioctl_nrt(struct rtdm_dev_context
*context,
return err;
case RTTST_RTIOC_SWTEST_PEND:
- if (!rtdm_read_user_ok(user_info, arg, sizeof(task)))
+ if (!rtdm_read_user_ok(context, arg, sizeof(task)))
return -EFAULT;
- rtdm_copy_from_user(user_info, task, arg, sizeof(task));
+ rtdm_copy_from_user(context, task, arg, sizeof(task));
return rtswitch_pend_nrt(ctx, task.index);
case RTTST_RTIOC_SWTEST_SWITCH_TO:
- if (!rtdm_read_user_ok(user_info, arg, sizeof(fromto)))
+ if (!rtdm_read_user_ok(context, arg, sizeof(fromto)))
return -EFAULT;
- rtdm_copy_from_user(user_info,
+ rtdm_copy_from_user(context,
fromto,
