Prepare for compiling FORB "components" for RTEMS

[frescor/frsh-forb.git] / src / frsh / resources / dummy / frm_dummy.c

diff --git a/src/frsh/resources/dummy/frm_dummy.c b/src/frsh/resources/dummy/frm_dummy.c
index f9ff1702c0c075c8b16355f2680d7127259efebd..cd52d203459ba1f6689096d6519c6c3c4d6679c3 100644 (file)
--- a/src/frsh/resources/dummy/frm_dummy.c
+++ b/src/frsh/resources/dummy/frm_dummy.c
@@ -162,7 +162,6 @@ static struct fres_res_manager frm = {
 };
 
 static struct option long_opts[] = {
-    { "daemon",   optional_argument, NULL, 'd' },
     { "loglevel", 1, 0, 'l' },
     { "id",      required_argument, 0, 'i' },
     { "accept-all", 0, 0, 'a' },
@@ -181,14 +180,12 @@ usage(void)
        printf("  -l, --loglevel <number>|<domain>=<number>,...\n");
 }
 
-int main(int argc, char *argv[])
+FORB_MAIN(frm_dummy, forb_orb orb, int argc, char *argv[])
 {
-       forb_orb orb;
        int ret;
-       forb_init_attr_t attr = { .orb_id = "org.frescor.frm.dummy" };
        int  opt;
 
-       while ((opt = getopt_long(argc, argv, "ad::i:l:h", &long_opts[0], NULL)) != EOF) {
+       while ((opt = getopt_long(argc, argv, "ai:l:h", &long_opts[0], NULL)) != EOF) {
                switch (opt) {
                        case 'a':
                                opt_accept_all = true;
@@ -196,9 +193,9 @@ int main(int argc, char *argv[])
                                opt_daemon = true;
                                opt_pidfile = optarg;
                                break;
-                       case 'i':
-                               opt_res_id = atoi(optarg);
-                               break;
+                       case 'i':
+                               opt_res_id = atoi(optarg);
+                               break;
                        case 'l':
                                ul_log_domain_arg2levels(optarg);
                                break;
@@ -212,9 +209,6 @@ int main(int argc, char *argv[])
        if (opt_daemon)
                forb_daemon_prepare(opt_pidfile);
 
-       orb = forb_init(&argc, &argv, &attr);
-       if (!orb) error(1, errno, "forb_init");
-
        /* Register fres_block_dummy_sched to contract handling
         * functions */
        fres_block_register_dummy();