Adapt parameters order in *_edffm programs to new format

- "num1 denom1 cpu1 num2 denom2 cpu2" instead of
  "num1 denom1 num2 denom2 cpu1 cpu2"

2 files changed, 8 insertions, 8 deletions

diff --git a/bin/rt_launch_edffm.c b/bin/rt_launch_edffm.c
index fcb895e..ddde7dd 100644
--- a/bin/rt_launch_edffm.c
+++ b/bin/rt_launch_edffm.c
@@ -30,7 +30,7 @@ int launch(void *task_info_p) {
 
 void usage(char *error) {
         fprintf(stderr, "%s\nUsage: rt_launch [-w][-v][-p cpu][-c hrt | srt | be] wcet period"
-                        " fracnum1 fracden2 fracnum2 fracden2 cpu1 cpu2 program [arg1 arg2 ...]\n"
+                        " fracnum1 fracden1 cpu1 fracnum2 fracden2 cpu2 program [arg1 arg2 ...]\n"
                         "\t-w\tSynchronous release\n"
                         "\t-v\tVerbose\n"
                         "\t-p\tcpu (or initial cpu)\n"
@@ -97,9 +97,9 @@ int main(int argc, char** argv)
         /* frac num, den = 0 means fixed task */
         frac1[0]  = atoi(argv[optind + 2]);
         frac1[1]  = atoi(argv[optind + 3]);
-        frac2[0]  = atoi(argv[optind + 4]);
-        frac2[1]  = atoi(argv[optind + 5]);
-        cpu1      = atoi(argv[optind + 6]);
+        cpu1      = atoi(argv[optind + 4]);
+        frac2[0]  = atoi(argv[optind + 5]);
+        frac2[1]  = atoi(argv[optind + 6]);
         cpu2      = atoi(argv[optind + 7]);
         if (wcet <= 0)
         usage("The worst-case execution time must be a "
diff --git a/bin/rtspin_edffm.c b/bin/rtspin_edffm.c
index d28d028..5271c10 100644
--- a/bin/rtspin_edffm.c
+++ b/bin/rtspin_edffm.c
@@ -30,7 +30,7 @@ static double wctime()
 void usage(char *error) {
         fprintf(stderr, "Error: %s\n", error);
         fprintf(stderr,
-                "Usage: rt_spin [-w] [-p PARTITION] [-c CLASS] WCET PERIOD DURATION fracnum1 fracden2 fracnum2 fracden2 cpu1 cpu2\n"
+                "Usage: rt_spin [-w] [-p PARTITION] [-c CLASS] WCET PERIOD DURATION fracnum1 fracden2 cpu1 fracnum2 fracden2 cpu2\n"
                 "       rt_spin -l\n");
         exit(1);
 }
@@ -209,9 +209,9 @@ int main(int argc, char** argv)
         /* frac num, den = 0 means fixed task */
         frac1[0]  = atoi(argv[optind + 3]);
         frac1[1]  = atoi(argv[optind + 4]);
-        frac2[0]  = atoi(argv[optind + 5]);
-        frac2[1]  = atoi(argv[optind + 6]);
-        cpu1      = atoi(argv[optind + 7]);
+        cpu1      = atoi(argv[optind + 5]);
+        frac2[0]  = atoi(argv[optind + 6]);
+        frac2[1]  = atoi(argv[optind + 7]);
         cpu2      = atoi(argv[optind + 8]);
         wcet   = wcet_ms * __NS_PER_MS;
         period = period_ms * __NS_PER_MS;