reworking NOS1 bearer configuration to take info from file

This commit is contained in:
francescomani
2024-01-23 10:24:41 +01:00
parent 47c069347d
commit 3443248322
3 changed files with 13 additions and 37 deletions
+4 -3
View File
@@ -368,7 +368,8 @@ void init_openair0(void) {
}
}
static void init_pdcp(int ue_id) {
static void init_pdcp(int ue_id)
{
uint32_t pdcp_initmask = (!IS_SOFTMODEM_NOS1) ? LINK_ENB_PDCP_TO_GTPV1U_BIT : (LINK_ENB_PDCP_TO_GTPV1U_BIT | PDCP_USE_NETLINK_BIT | LINK_ENB_PDCP_TO_IP_DRIVER_BIT);
/*if (IS_SOFTMODEM_RFSIM || (nfapi_getmode()==NFAPI_UE_STUB_PNF)) {
@@ -510,8 +511,6 @@ int main(int argc, char **argv)
memset(PHY_vars_UE_g[0][CC_id], 0, sizeof(*PHY_vars_UE_g[0][CC_id]));
}
init_NR_UE(NB_UE_INST, uecap_file, reconfig_file, rbconfig_file);
int mode_offset = get_softmodem_params()->nsa ? NUMBER_OF_UE_MAX : 1;
uint16_t node_number = get_softmodem_params()->node_number;
ue_id_g = (node_number == 0) ? 0 : node_number - 2;
@@ -525,6 +524,8 @@ int main(int argc, char **argv)
}
}
init_NR_UE(NB_UE_INST, uecap_file, reconfig_file, rbconfig_file);
if (get_softmodem_params()->emulate_l1) {
RCconfig_nr_ue_macrlc();
get_channel_model_mode(uniqCfg);