forb: executable resources and fcb changed into dynamic libs

[frescor/frsh.git] / resources / cpu_aquosa / mngr / frm_aqcpu.c

diff --git a/resources/cpu_aquosa/mngr/frm_aqcpu.c b/resources/cpu_aquosa/mngr/frm_aqcpu.c
index 381ad70ad6b6aae5a8ec38f428303f875dccb29d..51c32d7817d6eaeeaf6ec80e83ffee63759a09a9 100644 (file)
--- a/resources/cpu_aquosa/mngr/frm_aqcpu.c
+++ b/resources/cpu_aquosa/mngr/frm_aqcpu.c
@@ -116,13 +116,11 @@ static void
 usage(void)
 {
        printf("usage: frm_aqcpu [ options ]\n");
-       printf("  -d, --daemon [pid-file]   go to background after FORB initialization\n");
        printf("  -l, --loglevel <number>|<domain>=<number>,...\n");
 }
 
-int main(int argc, char *argv[])
+int forb_main(forb_orb orb, int argc, char *argv[])
 {
-       forb_orb orb;
        int ret;
        forb_init_attr_t attr = { .orb_id = "org.frescor.frm.aqcpu" };
        int  opt;
@@ -131,12 +129,8 @@ int main(int argc, char *argv[])
 
        ul_logreg_domain(&ulogd_frm_aqcpu);
 
-       while ((opt = getopt_long(argc, argv, "d::hl:", &long_opts[0], NULL)) != EOF) {
+       while ((opt = getopt_long(argc, argv, "hl:", &long_opts[0], NULL)) != EOF) {
                switch (opt) {
-                       case 'd':
-                               opt_daemon = true;
-                               opt_pidfile = optarg;
-                               break;
                        case 'l':
                                ul_log_domain_arg2levels(optarg);
                                break;
@@ -147,11 +141,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");
 
        frm.res_id = frsh_get_local_cpu_id();
        ret = frm_register_and_run(orb, &frm);