X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?p=o-du%2Fphy.git;a=blobdiff_plain;f=fapi_5g%2Fsource%2Futils%2Fnr5g_fapi_config_loader.c;fp=fapi_5g%2Fsource%2Futils%2Fnr5g_fapi_config_loader.c;h=a6fa6bd6003d666aaed52f3748234f8c89f4cc8c;hp=2aa684b6d0cbf4d1d8855b57e18ad0267945aebe;hb=70d9d920dd4e575f085f1f1a9050fefd1c10e127;hpb=331df2273a6667941167c9bcc141a517369bdf43 diff --git a/fapi_5g/source/utils/nr5g_fapi_config_loader.c b/fapi_5g/source/utils/nr5g_fapi_config_loader.c index 2aa684b..a6fa6bd 100644 --- a/fapi_5g/source/utils/nr5g_fapi_config_loader.c +++ b/fapi_5g/source/utils/nr5g_fapi_config_loader.c @@ -67,6 +67,7 @@ p_nr5g_fapi_cfg_t nr5g_fapi_config_loader( pclose(fp); return NULL; } + pclose(fp); num_cpus = atoi(max_core); entry = rte_cfgfile_get_entry(cfg_file, "MAC2PHY_WORKER", "core_id"); if (entry) { @@ -79,7 +80,8 @@ p_nr5g_fapi_cfg_t nr5g_fapi_config_loader( } entry = - rte_cfgfile_get_entry(cfg_file, "MAC2PHY_WORKER", "thread_sched_policy"); + rte_cfgfile_get_entry(cfg_file, "MAC2PHY_WORKER", + "thread_sched_policy"); if (entry) { cfg->mac2phy_worker.thread_sched_policy = (uint8_t) atoi(entry); if (cfg->mac2phy_worker.thread_sched_policy != SCHED_FIFO && @@ -118,7 +120,8 @@ p_nr5g_fapi_cfg_t nr5g_fapi_config_loader( } entry = - rte_cfgfile_get_entry(cfg_file, "PHY2MAC_WORKER", "thread_sched_policy"); + rte_cfgfile_get_entry(cfg_file, "PHY2MAC_WORKER", + "thread_sched_policy"); if (entry) { cfg->phy2mac_worker.thread_sched_policy = (uint8_t) atoi(entry); if (cfg->phy2mac_worker.thread_sched_policy != SCHED_FIFO && @@ -168,13 +171,18 @@ p_nr5g_fapi_cfg_t nr5g_fapi_config_loader( cfg->logger.level = ERROR_LOG; else if (!strcmp(entry, "trace")) cfg->logger.level = TRACE_LOG; - else if (!strcmp(entry, "hexdump")) - cfg->logger.level = HEXDUMP_LOG; else cfg->logger.level = NONE_LOG; } - pclose(fp); + entry = rte_cfgfile_get_entry(cfg_file, "DPDK", "dpdk_iova_mode"); + if (entry) { + cfg->dpdk.iova_mode = (uint8_t) atoi(entry); + if (cfg->dpdk.iova_mode >= DPDK_IOVA_MAX_MODE) { + printf("The mode is out of range: %d", cfg->dpdk.iova_mode); + exit(-1); + } + } return cfg; }