maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Init F1 UE data structs at MAC, RRC & CU-UP

Browse Source
This commit is contained in:
Robert Schmidt
2023-08-11 17:38:12 +02:00
parent af545c07b7
commit 3e0f07705c
3 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
executables/nr-cuup.c
+2
View File
@@ -27,6 +27,7 @@
#include "common/ran_context.h" #include "common/ran_context.h"
#include "nfapi/oai_integration/vendor_ext.h" #include "nfapi/oai_integration/vendor_ext.h"
#include "openair2/F1AP/f1ap_common.h" #include "openair2/F1AP/f1ap_common.h"
#include "openair2/F1AP/f1ap_ids.h"
#include "openair2/GNB_APP/gnb_config.h" #include "openair2/GNB_APP/gnb_config.h"
#include "nr_pdcp/nr_pdcp_oai_api.h" #include "nr_pdcp/nr_pdcp_oai_api.h"
@@ -134,6 +135,7 @@ int main(int argc, char **argv)
rc = itti_create_task(TASK_CUUP_E1, E1AP_CUUP_task, NULL); rc = itti_create_task(TASK_CUUP_E1, E1AP_CUUP_task, NULL);
AssertFatal(rc >= 0, "Create task for CUUP E1 failed\n"); AssertFatal(rc >= 0, "Create task for CUUP E1 failed\n");
nr_pdcp_layer_init(); nr_pdcp_layer_init();
cu_init_f1_ue_data(); // for CU-UP/CP mapping: we use the same
MessageDef *msg = RCconfig_NR_CU_E1(true); MessageDef *msg = RCconfig_NR_CU_E1(true);
AssertFatal(msg != NULL, "Send init to task for E1AP UP failed\n"); AssertFatal(msg != NULL, "Send init to task for E1AP UP failed\n");
itti_send_msg_to_task(TASK_CUUP_E1, 0, msg); itti_send_msg_to_task(TASK_CUUP_E1, 0, msg);
openair2/LAYER2/NR_MAC_gNB/main.c
+3
View File
@@ -40,6 +40,7 @@
#include "nr_rlc/nr_rlc_oai_api.h" #include "nr_rlc/nr_rlc_oai_api.h"
#include "RRC/NR/MESSAGES/asn1_msg.h" #include "RRC/NR/MESSAGES/asn1_msg.h"
//#include "RRC/L2_INTERFACE/openair_rrc_L2_interface.h" //#include "RRC/L2_INTERFACE/openair_rrc_L2_interface.h"
#include "openair2/F1AP/f1ap_ids.h"
#include "common/ran_context.h" #include "common/ran_context.h"
#include "executables/softmodem-common.h" #include "executables/softmodem-common.h"
@@ -301,5 +302,7 @@ void mac_top_init_gNB(ngran_node_t node_type)
memset(&nrmac->UE_info, 0, sizeof(nrmac->UE_info)); memset(&nrmac->UE_info, 0, sizeof(nrmac->UE_info));
} }
du_init_f1_ue_data();
srand48(0); srand48(0);
} }
openair2/RRC/NR/rrc_gNB.c
+2
View File
@@ -97,6 +97,7 @@
#include <openair2/RRC/NR/nr_rrc_proto.h> #include <openair2/RRC/NR/nr_rrc_proto.h>
#include "openair2/LAYER2/nr_pdcp/nr_pdcp_e1_api.h" #include "openair2/LAYER2/nr_pdcp/nr_pdcp_e1_api.h"
#include "openair2/F1AP/f1ap_common.h" #include "openair2/F1AP/f1ap_common.h"
#include "openair2/F1AP/f1ap_ids.h"
#include "openair2/SDAP/nr_sdap/nr_sdap_entity.h" #include "openair2/SDAP/nr_sdap/nr_sdap_entity.h"
#include "cucp_cuup_if.h" #include "cucp_cuup_if.h"
@@ -310,6 +311,7 @@ static void rrc_gNB_CU_DU_init(gNB_RRC_INST *rrc)
AssertFatal(0 == 1, "Unknown node type %d\n", rrc->node_type); AssertFatal(0 == 1, "Unknown node type %d\n", rrc->node_type);
break; break;
} }
cu_init_f1_ue_data();
} }
static void openair_rrc_gNB_configuration(const module_id_t gnb_mod_idP, gNB_RrcConfigurationReq *configuration) static void openair_rrc_gNB_configuration(const module_id_t gnb_mod_idP, gNB_RrcConfigurationReq *configuration)