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

Remove pdcp_layer_init_for_CU function and merge to pdcp_layer_init.

Browse Source
This commit is contained in:
Masayuki Harada
2021-06-08 15:32:12 +09:00
parent 54666a932c
commit 1b69c2a00d
5 changed files with 6 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
executables/nr-softmodem.c
-1
View File
@@ -625,7 +625,6 @@ static void wait_nfapi_init(char *thread_name) {
void init_pdcp(void) { void init_pdcp(void) {
if (!NODE_IS_DU(RC.nrrrc[0]->node_type)) { if (!NODE_IS_DU(RC.nrrrc[0]->node_type)) {
// pdcp_layer_init(); // pdcp_layer_init();
// pdcp_layer_init_for_CU();
uint32_t pdcp_initmask = (IS_SOFTMODEM_NOS1) ? uint32_t pdcp_initmask = (IS_SOFTMODEM_NOS1) ?
(PDCP_USE_NETLINK_BIT | LINK_ENB_PDCP_TO_IP_DRIVER_BIT) : LINK_ENB_PDCP_TO_GTPV1U_BIT; (PDCP_USE_NETLINK_BIT | LINK_ENB_PDCP_TO_IP_DRIVER_BIT) : LINK_ENB_PDCP_TO_GTPV1U_BIT;
if (IS_SOFTMODEM_NOS1) { if (IS_SOFTMODEM_NOS1) {
openair2/GNB_APP/gnb_app.c
+1 -3
View File
@@ -135,8 +135,7 @@ static uint32_t gNB_app_register_x2(uint32_t gnb_id_start, uint32_t gnb_id_end)
static void init_pdcp(void) { static void init_pdcp(void) {
if (!NODE_IS_DU(RC.nrrrc[0]->node_type)) { if (!NODE_IS_DU(RC.nrrrc[0]->node_type)) {
// pdcp_layer_init(); pdcp_layer_init();
// pdcp_layer_init_for_CU();
uint32_t pdcp_initmask = (IS_SOFTMODEM_NOS1) ? uint32_t pdcp_initmask = (IS_SOFTMODEM_NOS1) ?
(PDCP_USE_NETLINK_BIT | LINK_ENB_PDCP_TO_IP_DRIVER_BIT) : LINK_ENB_PDCP_TO_GTPV1U_BIT; (PDCP_USE_NETLINK_BIT | LINK_ENB_PDCP_TO_IP_DRIVER_BIT) : LINK_ENB_PDCP_TO_GTPV1U_BIT;
if (IS_SOFTMODEM_NOS1) { if (IS_SOFTMODEM_NOS1) {
@@ -226,7 +225,6 @@ void *gNB_app_task(void *args_p)
LOG_E(F1AP, "Create task for F1AP CU failed\n"); LOG_E(F1AP, "Create task for F1AP CU failed\n");
AssertFatal(1==0,"exiting"); AssertFatal(1==0,"exiting");
} }
pdcp_layer_init_for_CU();
} }
if (NODE_IS_DU(RC.nrrrc[0]->node_type)) { if (NODE_IS_DU(RC.nrrrc[0]->node_type)) {
openair2/GNB_APP/gnb_config.c
+1 -1
View File
@@ -2086,7 +2086,7 @@ void nr_read_config_and_init(void) {
} }
if (NODE_IS_CU(RC.nrrrc[0]->node_type)) { if (NODE_IS_CU(RC.nrrrc[0]->node_type)) {
pdcp_layer_init_for_CU(); pdcp_layer_init();
// nr_DRB_preconfiguration(0x1234); // nr_DRB_preconfiguration(0x1234);
rrc_init_nr_global_param(); rrc_init_nr_global_param();
} }
openair2/LAYER2/nr_pdcp/nr_pdcp.h
-1
View File
@@ -24,7 +24,6 @@
#ifndef _NR_PDCP_H_ #ifndef _NR_PDCP_H_
#define _NR_PDCP_H_ #define _NR_PDCP_H_
void pdcp_layer_init_for_CU(void);
void nr_pdcp_layer_init_ue(void); void nr_pdcp_layer_init_ue(void);
void nr_DRB_preconfiguration(uint16_t crnti); void nr_DRB_preconfiguration(uint16_t crnti);
openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
+4 -17
View File
@@ -369,27 +369,14 @@ void pdcp_layer_init(void)
if (pthread_mutex_unlock(&m) != 0) abort(); if (pthread_mutex_unlock(&m) != 0) abort();
nr_pdcp_ue_manager = new_nr_pdcp_ue_manager(1); nr_pdcp_ue_manager = new_nr_pdcp_ue_manager(1);
init_nr_rlc_data_req_queue();
if ((RC.nrrrc == NULL) || (!NODE_IS_CU(RC.nrrrc[0]->node_type))) {
init_nr_rlc_data_req_queue();
}
nr_pdcp_init_timer_thread(nr_pdcp_ue_manager); nr_pdcp_init_timer_thread(nr_pdcp_ue_manager);
} }
void pdcp_layer_init_for_CU(void)
{
/* hack: be sure to initialize only once */
static pthread_mutex_t m = PTHREAD_MUTEX_INITIALIZER;
static int initialized = 0;
if (pthread_mutex_lock(&m) != 0) abort();
if (initialized) {
if (pthread_mutex_unlock(&m) != 0) abort();
return;
}
initialized = 1;
if (pthread_mutex_unlock(&m) != 0) abort();
nr_pdcp_ue_manager = new_nr_pdcp_ue_manager(1);
}
#include "nfapi/oai_integration/vendor_ext.h" #include "nfapi/oai_integration/vendor_ext.h"
#include "targets/RT/USER/lte-softmodem.h" #include "targets/RT/USER/lte-softmodem.h"
#include "openair2/RRC/NAS/nas_config.h" #include "openair2/RRC/NAS/nas_config.h"