Merge remote-tracking branch 'origin/fix-cudu' into develop_integration_2019_w17

openair2/ENB_APP/enb_config.c

@@ -2871,12 +2871,4 @@ void read_config_and_init(void) {
     memset((void *)RC.rrc[enb_id], 0, sizeof(eNB_RRC_INST));
     RCconfig_RRC(enb_id, RC.rrc[enb_id],macrlc_has_f1[enb_id]);
   }
-
-  if (!NODE_IS_DU(RC.rrc[0]->node_type)) {
-    pdcp_layer_init();
-
-    if ( NODE_IS_CU(RC.rrc[0]->node_type) ) {
-      pdcp_set_rlc_funcptr((send_rlc_data_req_func_t)proto_agent_send_rlc_data_req, (pdcp_data_ind_func_t)proto_agent_send_pdcp_data_ind);
-    }
-  }
 }

openair2/LAYER2/PDCP_v10.1.0/pdcp.c

@@ -2140,9 +2140,11 @@ pdcp_data_ind_func_t get_pdcp_data_ind_func() {
   return pdcp_params.pdcp_data_ind_func;
 }
 
-void pdcp_set_rlc_funcptr(send_rlc_data_req_func_t send_rlc_data_req,
-                          pdcp_data_ind_func_t pdcp_data_ind) {
+void pdcp_set_rlc_data_req_func(send_rlc_data_req_func_t send_rlc_data_req) {
   pdcp_params.send_rlc_data_req_func = send_rlc_data_req;
+}
+
+void pdcp_set_pdcp_data_ind_func(pdcp_data_ind_func_t pdcp_data_ind) {
   pdcp_params.pdcp_data_ind_func = pdcp_data_ind;
 }
 
@@ -2175,9 +2177,6 @@ uint64_t pdcp_module_init( uint64_t pdcp_optmask ) {
       netlink_init();
     }
   }
-
-  /* default interface with rlc (will be modified if CU) */
-  pdcp_set_rlc_funcptr((send_rlc_data_req_func_t)rlc_data_req, (pdcp_data_ind_func_t) pdcp_data_ind);
   return pdcp_params.optmask ;
 }
 

openair2/LAYER2/PDCP_v10.1.0/pdcp.h

@@ -412,8 +412,8 @@ int pdcp_fifo_flush_sdus                      ( const protocol_ctxt_t *const  ct
 int pdcp_fifo_read_input_sdus_remaining_bytes ( const protocol_ctxt_t *const  ctxt_pP);
 int pdcp_fifo_read_input_sdus                 ( const protocol_ctxt_t *const  ctxt_pP);
 void pdcp_fifo_read_input_sdus_from_otg       ( const protocol_ctxt_t *const  ctxt_pP);
-void pdcp_set_rlc_funcptr(send_rlc_data_req_func_t send_rlc_data_req,
-                          pdcp_data_ind_func_t pdcp_data_ind);
+void pdcp_set_rlc_data_req_func(send_rlc_data_req_func_t send_rlc_data_req);
+void pdcp_set_pdcp_data_ind_func(pdcp_data_ind_func_t pdcp_data_ind);
 pdcp_data_ind_func_t get_pdcp_data_ind_func(void);
 //-----------------------------------------------------------------------------
 

openair2/LAYER2/PROTO_AGENT/proto_agent.c

@@ -191,14 +191,14 @@ rlc_op_status_t  proto_agent_send_rlc_data_req(const protocol_ctxt_t *const ctxt
 
   proto_agent_async_msg_send((void *)msg, (int) msgsize, 1, proto_agent[mod_id].channel->channel_info);
   free_mem_block(sdu_pP, __func__);
-  return 0;
+  return RLC_OP_STATUS_OK;
 error:
   LOG_E(PROTO_AGENT, "PROTO_AGENT there was an error\n");
-  return -1;
+  return RLC_OP_STATUS_INTERNAL_ERROR;
 }
 
 
-void
+boolean_t
 proto_agent_send_pdcp_data_ind(const protocol_ctxt_t *const ctxt_pP, const srb_flag_t srb_flagP,
                                const MBMS_flag_t MBMS_flagP, const rb_id_t rb_idP, sdu_size_t sdu_sizeP, mem_block_t *sdu_pP) {
   uint8_t *msg = NULL;
@@ -225,10 +225,10 @@ proto_agent_send_pdcp_data_ind(const protocol_ctxt_t *const ctxt_pP, const srb_f
 
   proto_agent_async_msg_send((void *)msg, (int) msgsize, 1, proto_agent[mod_id].channel->channel_info);
   free_mem_block(sdu_pP, __func__);
-  return;
+  return TRUE;
 error:
   LOG_E(PROTO_AGENT, "there was an error in %s\n", __func__);
-  return;
+  return FALSE;
 }
 
 void *

openair2/LAYER2/PROTO_AGENT/proto_agent.h

@@ -51,7 +51,7 @@ rlc_op_status_t proto_agent_send_rlc_data_req( const protocol_ctxt_t *const ctxt
     const rb_id_t rb_idP, const mui_t muiP, confirm_t confirmP,
     sdu_size_t sdu_sizeP, mem_block_t *sdu_pP);
 
-void proto_agent_send_pdcp_data_ind(const protocol_ctxt_t *const ctxt_pP,
+boolean_t proto_agent_send_pdcp_data_ind(const protocol_ctxt_t *const ctxt_pP,
                                     const srb_flag_t srb_flagP, const MBMS_flag_t MBMS_flagP,
                                     const rb_id_t rb_idP, sdu_size_t sdu_sizeP, mem_block_t *sdu_pP);
 

openair2/LAYER2/RLC/rlc.c

@@ -52,10 +52,6 @@ extern boolean_t pdcp_data_ind(
 //#define TRACE_RLC_PAYLOAD 1
 #define DEBUG_RLC_DATA_REQ 1
 
-
-
-#include "proto_agent.h"
-
 //-----------------------------------------------------------------------------
 void rlc_util_print_hex_octets(comp_name_t componentP, unsigned char *dataP, const signed long sizeP)
 //-----------------------------------------------------------------------------