Module: xenomai-3 Branch: master Commit: 9c0fd085f74d95a3d606d4a4ea56a46712f81a83 URL: http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=9c0fd085f74d95a3d606d4a4ea56a46712f81a83
Author: Philippe Gerum <r...@xenomai.org> Date: Mon May 18 20:56:51 2015 +0200 vxworks/testsuite: fix FUNCPTR targets --- lib/vxworks/testsuite/lst-1.c | 3 +-- lib/vxworks/testsuite/msgQ-1.c | 3 +-- lib/vxworks/testsuite/msgQ-2.c | 6 ++---- lib/vxworks/testsuite/msgQ-3.c | 6 ++---- lib/vxworks/testsuite/rng-1.c | 3 +-- lib/vxworks/testsuite/sem-1.c | 6 ++---- lib/vxworks/testsuite/sem-2.c | 6 ++---- lib/vxworks/testsuite/sem-3.c | 3 +-- lib/vxworks/testsuite/sem-4.c | 3 +-- lib/vxworks/testsuite/task-1.c | 2 +- lib/vxworks/testsuite/task-2.c | 6 ++---- lib/vxworks/testsuite/wd-1.c | 3 +-- 12 files changed, 17 insertions(+), 33 deletions(-) diff --git a/lib/vxworks/testsuite/lst-1.c b/lib/vxworks/testsuite/lst-1.c index b88a0a4..03dec36 100644 --- a/lib/vxworks/testsuite/lst-1.c +++ b/lib/vxworks/testsuite/lst-1.c @@ -7,8 +7,7 @@ static struct traceobj trobj; -static void rootTask(long a0, long a1, long a2, long a3, long a4, - long a5, long a6, long a7, long a8, long a9) +static void rootTask(long arg, ...) { NODE first, second, third, fourth; LIST list; diff --git a/lib/vxworks/testsuite/msgQ-1.c b/lib/vxworks/testsuite/msgQ-1.c index 97ebc11..fd15e1d 100644 --- a/lib/vxworks/testsuite/msgQ-1.c +++ b/lib/vxworks/testsuite/msgQ-1.c @@ -22,8 +22,7 @@ static int messages[] = { 0xbcbcbcbc }; -static void rootTask(long a0, long a1, long a2, long a3, long a4, - long a5, long a6, long a7, long a8, long a9) +static void rootTask(long arg, ...) { MSG_Q_ID qid; int ret, msg; diff --git a/lib/vxworks/testsuite/msgQ-2.c b/lib/vxworks/testsuite/msgQ-2.c index e4a60d3..58f11e3 100644 --- a/lib/vxworks/testsuite/msgQ-2.c +++ b/lib/vxworks/testsuite/msgQ-2.c @@ -30,8 +30,7 @@ static int messages[] = { MSG_Q_ID qid; -static void peerTask(long a0, long a1, long a2, long a3, long a4, - long a5, long a6, long a7, long a8, long a9) +static void peerTask(long arg, ...) { int ret, msg, n; @@ -49,8 +48,7 @@ static void peerTask(long a0, long a1, long a2, long a3, long a4, traceobj_exit(&trobj); } -static void rootTask(long a0, long a1, long a2, long a3, long a4, - long a5, long a6, long a7, long a8, long a9) +static void rootTask(long arg, ...) { TASK_ID tid; int ret, n; diff --git a/lib/vxworks/testsuite/msgQ-3.c b/lib/vxworks/testsuite/msgQ-3.c index d86df31..1a4e20d 100644 --- a/lib/vxworks/testsuite/msgQ-3.c +++ b/lib/vxworks/testsuite/msgQ-3.c @@ -16,8 +16,7 @@ static int tseq[] = { static MSG_Q_ID qid; -static void rootTask(long a0, long a1, long a2, long a3, long a4, - long a5, long a6, long a7, long a8, long a9) +static void rootTask(long arg, ...) { int ret, msg, n; @@ -62,8 +61,7 @@ static void rootTask(long a0, long a1, long a2, long a3, long a4, traceobj_exit(&trobj); } -static void peerTask(long a0, long a1, long a2, long a3, long a4, - long a5, long a6, long a7, long a8, long a9) +static void peerTask(long arg, ...) { int ret, msg; diff --git a/lib/vxworks/testsuite/rng-1.c b/lib/vxworks/testsuite/rng-1.c index e92c107..dd944a5 100644 --- a/lib/vxworks/testsuite/rng-1.c +++ b/lib/vxworks/testsuite/rng-1.c @@ -28,8 +28,7 @@ static struct traceobj trobj; } \ } -static void rootTask(long a0, long a1, long a2, long a3, long a4, - long a5, long a6, long a7, long a8, long a9) +static void rootTask(long arg, ...) { int j, res, k, chunks; const int putBytes = 10; diff --git a/lib/vxworks/testsuite/sem-1.c b/lib/vxworks/testsuite/sem-1.c index f4159c8..245eb5c 100644 --- a/lib/vxworks/testsuite/sem-1.c +++ b/lib/vxworks/testsuite/sem-1.c @@ -17,8 +17,7 @@ static int tseq[] = { static SEM_ID sem_id; -static void peerTask(long a0, long a1, long a2, long a3, long a4, - long a5, long a6, long a7, long a8, long a9) +static void peerTask(long arg, ...) { TASK_ID rtid; int ret; @@ -73,8 +72,7 @@ static void peerTask(long a0, long a1, long a2, long a3, long a4, traceobj_exit(&trobj); } -static void rootTask(long a0, long a1, long a2, long a3, long a4, - long a5, long a6, long a7, long a8, long a9) +static void rootTask(long arg, ...) { TASK_ID ptid; int ret; diff --git a/lib/vxworks/testsuite/sem-2.c b/lib/vxworks/testsuite/sem-2.c index 5c6cbda..c9befc4 100644 --- a/lib/vxworks/testsuite/sem-2.c +++ b/lib/vxworks/testsuite/sem-2.c @@ -15,8 +15,7 @@ static int tseq[] = { static SEM_ID sem_id; -static void peerTask(long a0, long a1, long a2, long a3, long a4, - long a5, long a6, long a7, long a8, long a9) +static void peerTask(long arg, ...) { TASK_ID rtid; int ret; @@ -53,8 +52,7 @@ static void peerTask(long a0, long a1, long a2, long a3, long a4, traceobj_exit(&trobj); } -static void rootTask(long a0, long a1, long a2, long a3, long a4, - long a5, long a6, long a7, long a8, long a9) +static void rootTask(long arg, ...) { int ret; diff --git a/lib/vxworks/testsuite/sem-3.c b/lib/vxworks/testsuite/sem-3.c index 03161c0..1041d25 100644 --- a/lib/vxworks/testsuite/sem-3.c +++ b/lib/vxworks/testsuite/sem-3.c @@ -13,8 +13,7 @@ static int tseq[] = { static SEM_ID sem_id; -static void rootTask(long a0, long a1, long a2, long a3, long a4, - long a5, long a6, long a7, long a8, long a9) +static void rootTask(long arg, ...) { int ret; diff --git a/lib/vxworks/testsuite/sem-4.c b/lib/vxworks/testsuite/sem-4.c index 7771373..5c82169 100644 --- a/lib/vxworks/testsuite/sem-4.c +++ b/lib/vxworks/testsuite/sem-4.c @@ -13,8 +13,7 @@ static struct traceobj trobj; static SEM_ID sem_id; -static void rootTask(long a0, long a1, long a2, long a3, long a4, - long a5, long a6, long a7, long a8, long a9) +static void rootTask(long arg, ...) { ULONG start; int ret; diff --git a/lib/vxworks/testsuite/task-1.c b/lib/vxworks/testsuite/task-1.c index a751fba..3cf5f38 100644 --- a/lib/vxworks/testsuite/task-1.c +++ b/lib/vxworks/testsuite/task-1.c @@ -35,7 +35,7 @@ int main(int argc, char *const argv[]) traceobj_init(&trobj, argv[0], sizeof(tseq) / sizeof(int)); - tid = taskSpawn("windTask", 70, 0, 0, windTask, + tid = taskSpawn("windTask", 70, 0, 0, (FUNCPTR)windTask, 1, 2, 4, 8, 16, 32, 64, 128, 256, 512); traceobj_assert(&trobj, tid != ERROR); diff --git a/lib/vxworks/testsuite/task-2.c b/lib/vxworks/testsuite/task-2.c index 17b2bed..46d99a2 100644 --- a/lib/vxworks/testsuite/task-2.c +++ b/lib/vxworks/testsuite/task-2.c @@ -22,8 +22,7 @@ static TASK_ID btid, ftid; static SEM_ID sem_id; -static void backgroundTask(long a1, long a2, long a3, long a4, long a5, - long a6, long a7, long a8, long a9, long a10) +static void backgroundTask(long arg, ...) { unsigned int safety = 100000000, count = 0; int ret; @@ -49,8 +48,7 @@ static void backgroundTask(long a1, long a2, long a3, long a4, long a5, traceobj_exit(&trobj); } -static void foregroundTask(long a1, long a2, long a3, long a4, long a5, - long a6, long a7, long a8, long a9, long a10) +static void foregroundTask(long arg, ...) { int ret; diff --git a/lib/vxworks/testsuite/wd-1.c b/lib/vxworks/testsuite/wd-1.c index 34a4170..b557545 100644 --- a/lib/vxworks/testsuite/wd-1.c +++ b/lib/vxworks/testsuite/wd-1.c @@ -45,8 +45,7 @@ static void watchdogHandler(long arg) traceobj_assert(&trobj, ret == OK); } -static void rootTask(long a0, long a1, long a2, long a3, long a4, - long a5, long a6, long a7, long a8, long a9) +static void rootTask(long arg, ...) { int ret; _______________________________________________ Xenomai-git mailing list Xenomai-git@xenomai.org http://xenomai.org/mailman/listinfo/xenomai-git