return ROK;
}
-#ifdef NR_TDD
/*******************************************************************
*
* @brief Fill NR TDD Info
}
return ROK;
}
-#endif
/*******************************************************************
*
strcpy((char*)modeCfg, (char*)xmlNodeListGetString(doc, cur->xmlChildrenNode, 1));
}
-#ifndef NR_TDD
- if ((!xmlStrcmp(cur->name, (const xmlChar *)"F1_NR_FDD_INFO")) && (cur->ns == ns))
+ if(strcmp(modeCfg, "FDD") == 0)
{
- if(strcmp(modeCfg, "FDD") == 0)
+ if ((!xmlStrcmp(cur->name, (const xmlChar *)"F1_NR_FDD_INFO")) && (cur->ns == ns))
{
if(parseF1NrFddInfo(doc, ns, cur, &nrModeInfo->mode.fdd) != ROK)
{
}
}
}
-#else
- if ((!xmlStrcmp(cur->name, (const xmlChar *)"F1_NR_TDD_INFO")) && (cur->ns == ns))
+ else
{
- if(strcmp(modeCfg, "TDD") == 0)
+ if ((!xmlStrcmp(cur->name, (const xmlChar *)"F1_NR_TDD_INFO")) && (cur->ns == ns))
{
if(parseF1NrTddInfo(doc, ns, cur, &nrModeInfo->mode.tdd) != ROK)
{
}
}
-#endif
cur = cur -> next;
}
return ROK;
if ((!xmlStrcmp(cur->name, (const xmlChar *)"NR_DL_ARFCN")) && (cur->ns == ns))
{
- carrierCfg->arfcnDL = convertArfcnToFreqKhz(atoi((char *)xmlNodeListGetString(doc, cur->xmlChildrenNode, 1)));
+ carrierCfg->arfcnDL = atoi((char *)xmlNodeListGetString(doc, cur->xmlChildrenNode, 1));
}
if ((!xmlStrcmp(cur->name, (const xmlChar *)"UL_BW")) && (cur->ns == ns))
if ((!xmlStrcmp(cur->name, (const xmlChar *)"NR_UL_ARFCN")) && (cur->ns == ns))
{
- carrierCfg->arfcnUL = convertArfcnToFreqKhz(atoi((char *)xmlNodeListGetString(doc, cur->xmlChildrenNode, 1)));
+ carrierCfg->arfcnUL = atoi((char *)xmlNodeListGetString(doc, cur->xmlChildrenNode, 1));
}
#endif
* ****************************************************************/
uint8_t duReadCfg()
{
- const char *filename = "../build/config/odu_config.xml";
+#ifdef NR_TDD
+ const char *filename = "../build/config/tdd_odu_config.xml";
+#else
+ const char *filename = "../build/config/fdd_odu_config.xml";
+#endif
xmlDocPtr doc = NULLP;
xmlNodePtr cur = NULLP;
xmlNsPtr ns = NULLP;