Merge remote-tracking branch 'origin/pdcp-ul-noS1-v2' into integration-develop-nr-2019w50

This commit is contained in:
Florian Kaltenberger
2019-12-12 12:52:55 +01:00
57 changed files with 1188 additions and 1604 deletions
+1 -1
View File
@@ -419,7 +419,7 @@ void processSlotRX( PHY_VARS_NR_UE *UE, UE_nr_rxtx_proc_t *proc) {
PROTOCOL_CTXT_SET_BY_MODULE_ID(&ctxt, UE->Mod_id, ENB_FLAG_NO,
0x1234, proc->frame_rx,
proc->nr_tti_rx, 0);
//pdcp_run(&ctxt);
pdcp_run(&ctxt);
pdcp_fifo_flush_sdus(&ctxt);
}
}
+1 -1
View File
@@ -664,7 +664,7 @@ int main( int argc, char **argv ) {
logInit();
// get options and fill parameters from configuration file
get_options (); //Command-line options, enb_properties
//get_common_options();
get_common_options();
#if T_TRACER
T_Config_Init();
#endif