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

Merge remote-tracking branch 'origin/NR_RRCConfiguration' into nr_tdd_configuration

Browse Source 
resolving merge conflicts
This commit is contained in:
Rakesh
2019-12-11 13:13:10 +01:00
parent af471c5c3e decf6ed0e5
commit a4b0c8edd0
12 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
executables/nr-ru.c
+1 -1
View File
@@ -533,7 +533,7 @@ void fh_if4p5_north_asynch_in(RU_t *ru,int *frame,int *slot) {
if (((nr_slot_select(cfg,frame_tx,slot_tx) & NR_DOWNLINK_SLOT) > 0) && (symbol_number == 0)) start_meas(&ru->rx_fhaul);
LOG_D(PHY,"subframe %d (%d): frame %d, subframe %d, symbol %d\n",
LOG_D(PHY,"slot %d (%d): frame %d, slot %d, symbol %d\n",
*slot,nr_slot_select(cfg,frame_tx,*slot),frame_tx,slot_tx,symbol_number);
if (proc->first_tx != 0) {