RTEMS initialization: a few bugs fixed

[frescor/frsh-forb.git] / src / frsh / frsh_api / frsh_core.c

diff --git a/src/frsh/frsh_api/frsh_core.c b/src/frsh/frsh_api/frsh_core.c
index 1e17525f152f9aced0f34833df4e2e46ece28f82..9e7856cda439eaef3a7b7cfc8bb28d5b78847176 100644 (file)
--- a/src/frsh/frsh_api/frsh_core.c
+++ b/src/frsh/frsh_api/frsh_core.c
@@ -100,13 +100,12 @@ int frsh_init()
        struct forb_init_attr attr = {
                .orb_id = "org.frescor.frsh_app"
        };
-       
+
        frsh_forb_global.orb = forb_init(NULL, NULL, &attr);
        if (!frsh_forb_global.orb) {
                ret = errno;
                goto err;
        }
-
        frsh_forb_global.fcb = forb_resolve_reference(frsh_forb_global.orb,
                                            fres_contract_broker_reg_name);
        if (!frsh_forb_global.fcb) {
@@ -121,7 +120,7 @@ int frsh_init()
        ret = fra_registry_init(frsh_forb_global.orb, frsh_forb_global.fcb,
                                &frsh_forb_global.alloc_executor);
        if (ret) goto err;
-       
+
 #ifdef CONFIG_AQUOSA
        ret = aqcpu_fra_init();
        if (ret) goto err;
@@ -149,6 +148,11 @@ int frsh_init()
        ret = fra_item_init();
        if (ret) goto err;
 #endif
+
+#ifdef CONFIG_RESOURCE_RTEMS_CPU
+       ret = rtemscpu_fra_init();
+       if (ret) goto err;
+#endif
        /* Run resource allocators */
        fosa_thread_create(&frsh_forb_global.alloc_executor_thread, NULL,
                           alloc_executor_thread, NULL);