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

Merge branch 'enhancement-10-harmony' of https://gitlab.eurecom.fr/oai/openairinterface5g into enhancement-10-harmony

Browse Source 
Conflicts:
	targets/RT/USER/lte-enb.c
This commit is contained in:
Raymond Knopp
2016-11-23 14:39:09 +08:00
parent adb0e77d39 8df3f84fc4
commit e3bf5fe068
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
targets/RT/USER/lte-enb.c
+3 -1
View File
@@ -760,7 +760,7 @@ void fh_if4p5_asynch_DL(PHY_VARS_eNB *eNB,int *frame,int *subframe) {
else { else {
if (frame_tx != *frame) { if (frame_tx != *frame) {
LOG_E(PHY,"fh_if4p5_asynch_DL: frame_tx %d is not what we expect %d\n",frame_tx,*frame); LOG_E(PHY,"fh_if4p5_asynch_DL: frame_tx %d is not what we expect %d\n",frame_tx,*frame);
exit_fun("Exiting"); // exit_fun("Exiting");
} }
if (subframe_tx != *subframe) { if (subframe_tx != *subframe) {
LOG_E(PHY,"fh_if4p5_asynch_DL: (frame %d) subframe_tx %d is not what we expect %d\n",frame_tx,subframe_tx,*subframe); LOG_E(PHY,"fh_if4p5_asynch_DL: (frame %d) subframe_tx %d is not what we expect %d\n",frame_tx,subframe_tx,*subframe);
@@ -777,6 +777,8 @@ void fh_if4p5_asynch_DL(PHY_VARS_eNB *eNB,int *frame,int *subframe) {
} }
} while (proc->symbol_mask[*subframe] != symbol_mask_full); } while (proc->symbol_mask[*subframe] != symbol_mask_full);
*frame = frame_tx;
// intialize this to zero after we're done with the subframe // intialize this to zero after we're done with the subframe
proc->symbol_mask[*subframe] = 0; proc->symbol_mask[*subframe] = 0;