Commit 5e3b47c0 authored by Jerome PERALDI's avatar Jerome PERALDI

Merge branch 'FRD-543' into '3GPP_TTCN_System_Simulator'

issue#88: Cmake changes to remove the NR_ENABLE flag and removal PDCP Stub function

See merge request firecell/rdsubscription/sequansrd!184
parents cee5067b 39ecec49
...@@ -860,13 +860,7 @@ add_boolean_option(LINUX_LIST False "used only in lists.c: either u ...@@ -860,13 +860,7 @@ add_boolean_option(LINUX_LIST False "used only in lists.c: either u
add_boolean_option(DRIVER2013 True "only relevant for EXMIMO") add_boolean_option(DRIVER2013 True "only relevant for EXMIMO")
add_boolean_option(EXMIMO_IOT True "????") add_boolean_option(EXMIMO_IOT True "????")
add_boolean_option(LOCALIZATION False "???") add_boolean_option(LOCALIZATION False "???")
if ($ENV{NR_ENABLE})
add_integer_option(MAX_NUM_CCs 1 "????") add_integer_option(MAX_NUM_CCs 1 "????")
Message("Cell configuration for NR is 1. MULTI CELLS NOT IMPLEMENTED")
else()
add_integer_option(MAX_NUM_CCs 3 "????")
Message("Cell configuration for LTE is ${MAX_NUM_CCs}: MULTI CELLS IS IMPLEMENTED")
endif()
add_boolean_option(SMBV False "Rohde&Schwarz SMBV100A vector signal generator") add_boolean_option(SMBV False "Rohde&Schwarz SMBV100A vector signal generator")
add_boolean_option(DEBUG_PHY False "Enable PHY layer debugging options") add_boolean_option(DEBUG_PHY False "Enable PHY layer debugging options")
add_boolean_option(DEBUG_PHY_PROC False "Enable debugging of PHY layer procedures") add_boolean_option(DEBUG_PHY_PROC False "Enable debugging of PHY layer procedures")
...@@ -1856,7 +1850,6 @@ set(L2_NR_SRC ...@@ -1856,7 +1850,6 @@ set(L2_NR_SRC
${NR_RRC_DIR}/rrc_gNB_reconfig.c ${NR_RRC_DIR}/rrc_gNB_reconfig.c
${NR_RRC_DIR}/rrc_gNB_UE_context.c ${NR_RRC_DIR}/rrc_gNB_UE_context.c
${NR_RRC_DIR}/rrc_gNB_NGAP.c ${NR_RRC_DIR}/rrc_gNB_NGAP.c
${PDCP_DIR}/pdcp_stub.c
) )
set(L2_SRC_UE set(L2_SRC_UE
...@@ -2782,14 +2775,6 @@ target_link_libraries (lte-uesoftmodem lttng-ust) ...@@ -2782,14 +2775,6 @@ target_link_libraries (lte-uesoftmodem lttng-ust)
# nr-softmodem # nr-softmodem
################################################### ###################################################
if ($ENV{NR_ENABLE})
add_boolean_option(NR_ENABLE TRUE "Flag for NR compilation")
else()
add_boolean_option(NR_ENABLE FALSE "Flag for NR compilation")
endif()
Message("NR_ENABLE flag is ${NR_ENABLE}")
add_executable(nr-softmodem add_executable(nr-softmodem
${rrc_h} ${rrc_h}
${nr_rrc_h} ${nr_rrc_h}
......
...@@ -2887,6 +2887,13 @@ void pdcp_layer_init(void) ...@@ -2887,6 +2887,13 @@ void pdcp_layer_init(void)
memset(Pdcp_stats_rx_aiat, 0, sizeof(Pdcp_stats_rx_aiat)); memset(Pdcp_stats_rx_aiat, 0, sizeof(Pdcp_stats_rx_aiat));
memset(Pdcp_stats_rx_iat, 0, sizeof(Pdcp_stats_rx_iat)); memset(Pdcp_stats_rx_iat, 0, sizeof(Pdcp_stats_rx_iat));
memset(Pdcp_stats_rx_outoforder, 0, sizeof(Pdcp_stats_rx_outoforder)); memset(Pdcp_stats_rx_outoforder, 0, sizeof(Pdcp_stats_rx_outoforder));
RC.ss.ss_pdcp_api = calloc (1, sizeof(ss_rrc_pdcp_api_t));
ss_rrc_pdcp_api_t *ss_pdcp_api = RC.ss.ss_pdcp_api;
if (RC.ss.mode == 1) {
ss_pdcp_api->set_pdcp_cnt = pdcp_fill_ss_pdcp_cnt;
}
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
......
...@@ -569,5 +569,17 @@ extern notifiedFIFO_t pdcp_sdu_list; ...@@ -569,5 +569,17 @@ extern notifiedFIFO_t pdcp_sdu_list;
extern hash_table_t *pdcp_coll_p; extern hash_table_t *pdcp_coll_p;
// ----------------------------------------------------------------------------
typedef void (*ss_set_pdcp_cnt_cb)(pdcp_t *pdcp_p , uint32_t rb_id, ss_get_pdcp_cnt_t *pc);
typedef void (*ss_set_secu_cipher_cb)(pdcp_t *pdcp_p , uint8_t security_modeP);
typedef struct ss_rrc_pdcp_api_s {
ss_set_pdcp_cnt_cb set_pdcp_cnt;
ss_set_secu_cipher_cb set_secu_cipher;
} ss_rrc_pdcp_api_t;
// ----------------------------------------------------------------------------
#endif #endif
/*@}*/ /*@}*/
...@@ -7912,7 +7912,6 @@ void rrc_eNB_as_security_configuration_req( ...@@ -7912,7 +7912,6 @@ void rrc_eNB_as_security_configuration_req(
LOG_A(RRC,"Inside rrc_eNB_as_security_configuration_req \n"); LOG_A(RRC,"Inside rrc_eNB_as_security_configuration_req \n");
AssertFatal(ASSecConfReq!=NULL,"AS Security Config Request is NULL \n"); AssertFatal(ASSecConfReq!=NULL,"AS Security Config Request is NULL \n");
#ifndef NR_ENABLE
for (int i = 0; i < MAX_RBS; i++) for (int i = 0; i < MAX_RBS; i++)
{ {
if (i < 3) if (i < 3)
...@@ -7928,7 +7927,8 @@ void rrc_eNB_as_security_configuration_req( ...@@ -7928,7 +7927,8 @@ void rrc_eNB_as_security_configuration_req(
h_rc = hashtable_get(pdcp_coll_p, key, (void **) &pdcp_p); h_rc = hashtable_get(pdcp_coll_p, key, (void **) &pdcp_p);
if (h_rc == HASH_TABLE_OK) if (h_rc == HASH_TABLE_OK)
{ {
pdcp_fill_ss_pdcp_cnt(pdcp_p, rb_idx, &pc); AssertFatal(NULL != RC.ss.ss_pdcp_api, "SS PDCP APIs NULL \n");
RC.ss.ss_pdcp_api->set_pdcp_cnt(pdcp_p, rb_idx, &pc);
ul_sqn = ASSecConfReq->Ciphering.ActTimeList.SecurityActTime[rb_idx].UL.sqn; ul_sqn = ASSecConfReq->Ciphering.ActTimeList.SecurityActTime[rb_idx].UL.sqn;
dl_sqn = ASSecConfReq->Ciphering.ActTimeList.SecurityActTime[rb_idx].DL.sqn; dl_sqn = ASSecConfReq->Ciphering.ActTimeList.SecurityActTime[rb_idx].DL.sqn;
/* Apply the security key for all the configured RBs SQN is check is applicable for SRB1. /* Apply the security key for all the configured RBs SQN is check is applicable for SRB1.
...@@ -7958,7 +7958,6 @@ void rrc_eNB_as_security_configuration_req( ...@@ -7958,7 +7958,6 @@ void rrc_eNB_as_security_configuration_req(
rbid_, ctxt_pP->module_id, ASSecConfReq->rnti, ctxt_pP->enb_flag); rbid_, ctxt_pP->module_id, ASSecConfReq->rnti, ctxt_pP->enb_flag);
} }
} }
#endif
} }
/*------------------------------------------------------------------------------*/ /*------------------------------------------------------------------------------*/
...@@ -10600,8 +10599,6 @@ void *rrc_enb_process_itti_msg(void *notUsed) { ...@@ -10600,8 +10599,6 @@ void *rrc_enb_process_itti_msg(void *notUsed) {
case SS_RRC_PDU_REQ: case SS_RRC_PDU_REQ:
if (RC.ss.mode >= SS_SOFTMODEM) if (RC.ss.mode >= SS_SOFTMODEM)
{ {
#ifndef NR_ENABLE
LOG_A(RRC,"RRC received SS_RRC_PDU_REQ SRB_ID:%d SDU_SIZE:%d rnti %d instance %ld\n", SS_RRC_PDU_REQ (msg_p).srb_id, SS_RRC_PDU_REQ (msg_p).sdu_size, LOG_A(RRC,"RRC received SS_RRC_PDU_REQ SRB_ID:%d SDU_SIZE:%d rnti %d instance %ld\n", SS_RRC_PDU_REQ (msg_p).srb_id, SS_RRC_PDU_REQ (msg_p).sdu_size,
SS_RRC_PDU_REQ(msg_p).rnti,instance); SS_RRC_PDU_REQ(msg_p).rnti,instance);
...@@ -10769,7 +10766,6 @@ void *rrc_enb_process_itti_msg(void *notUsed) { ...@@ -10769,7 +10766,6 @@ void *rrc_enb_process_itti_msg(void *notUsed) {
bcchTransportType = dlsch_TRANSPORT; bcchTransportType = dlsch_TRANSPORT;
} }
} }
#endif
} }
break; break;
//#endif //#endif
......
...@@ -31,6 +31,8 @@ ...@@ -31,6 +31,8 @@
#ifndef __SS_CONFIG_H__ #ifndef __SS_CONFIG_H__
#define __SS_CONFIG_H__ #define __SS_CONFIG_H__
#include "openair2/LAYER2/PDCP_v10.1.0/pdcp.h"
#if 0 /** TODO: FC */ #if 0 /** TODO: FC */
typedef enum ss_mode { typedef enum ss_mode {
SS_ENB = 0x00, SS_ENB = 0x00,
...@@ -71,6 +73,7 @@ typedef struct ss_config_s { ...@@ -71,6 +73,7 @@ typedef struct ss_config_s {
int mac_rlc_data_ind_frame; int mac_rlc_data_ind_frame;
int mac_rlc_data_ind_subframe; int mac_rlc_data_ind_subframe;
ss_l1macind_ctrl_t l1macind; ss_l1macind_ctrl_t l1macind;
ss_rrc_pdcp_api_t *ss_pdcp_api;
} ss_config_t; } ss_config_t;
/** /**
typedef enum { typedef enum {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment