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

Merge branch '341-modulation-bugfix' of https://gitlab.eurecom.fr/oai/openairinterface5g into 341-modulation-bugfix

Browse Source 
Conflicts:
	openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
This commit is contained in:
WANG Tsu-Han
2018-08-22 15:58:17 +02:00
parent 30cc9c1c66 7fed2bec9d
commit 4bdf8e60fc
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
+2 -4
View File
@@ -2535,7 +2535,8 @@ int dlsch_modulation(PHY_VARS_eNB* phy_vars_eNB,
* previous version. Some more work/validation is needed before * previous version. Some more work/validation is needed before
* we switch to the new version. * we switch to the new version.
*/ */
//allocate_REs = allocate_REs_in_RB; //if (frame_parms->N_RB_DL==25)
//allocate_REs = allocate_REs_in_RB;
switch (mod_order1) { switch (mod_order1) {
case 2: case 2:
@@ -2588,9 +2589,6 @@ int dlsch_modulation(PHY_VARS_eNB* phy_vars_eNB,
skip_half = check_skiphalf(rb,subframe_offset,frame_parms,l,nsymb); skip_half = check_skiphalf(rb,subframe_offset,frame_parms,l,nsymb);
skip_dc = check_skip_dc(rb,frame_parms); skip_dc = check_skip_dc(rb,frame_parms);
/*if(skip_half>0)
allocate_REs = allocate_REs_in_RB;
*/
if (dlsch0) { if (dlsch0) {
if (dlsch0_harq->Nlayers>1) { if (dlsch0_harq->Nlayers>1) {