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

[OAI-UE] fix pucch format2 regression

Browse Source
This commit is contained in:
hbilel
2017-02-14 18:31:57 +01:00
parent 4ecdfa05f1
commit bfa8a28ccb
1 changed files with 44 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair1/PHY/LTE_TRANSPORT/pucch.c
+44 -45
View File
@@ -523,8 +523,29 @@ void generate_pucch2x(int32_t **txdataF,
pucch2x_modulation(btilde,d,amp); pucch2x_modulation(btilde,d,amp);
// add extra symbol for 2a/2b // add extra symbol for 2a/2b
d[20]=0;
d[21]=0;
if (fmt==pucch_format2a)
d[20] = (B2 == 0) ? amp : -amp;
else if (fmt==pucch_format2b) {
switch (B2) {
case 0:
d[20] = amp;
break;
case 1:
d[21] = -amp;
break;
case 2:
d[21] = amp;
break;
case 3:
d[20] = -amp;
break;
default:
AssertFatal(1==0,"Illegal modulation symbol %d for PUCCH %s\n",B2,pucch_format_string[fmt]);
break;
}
}
#ifdef DEBUG_PUCCH_TX #ifdef DEBUG_PUCCH_TX
@@ -552,7 +573,8 @@ void generate_pucch2x(int32_t **txdataF,
n_cs = (ncs_cell[ns][l]+nprime)%12; n_cs = (ncs_cell[ns][l]+nprime)%12;
alpha_ind = 0; alpha_ind = 0;
for (n=0; n<12; n++) { for (n=0; n<12; n++)
{
// this is r_uv^alpha(n) // this is r_uv^alpha(n)
ref_re = (int16_t)(((int32_t)alpha_re[alpha_ind] * ul_ref_sigs[u][v][0][n<<1] - (int32_t)alpha_im[alpha_ind] * ul_ref_sigs[u][v][0][1+(n<<1)])>>15); ref_re = (int16_t)(((int32_t)alpha_re[alpha_ind] * ul_ref_sigs[u][v][0][n<<1] - (int32_t)alpha_im[alpha_ind] * ul_ref_sigs[u][v][0][1+(n<<1)])>>15);
ref_im = (int16_t)(((int32_t)alpha_re[alpha_ind] * ul_ref_sigs[u][v][0][1+(n<<1)] + (int32_t)alpha_im[alpha_ind] * ul_ref_sigs[u][v][0][n<<1])>>15); ref_im = (int16_t)(((int32_t)alpha_re[alpha_ind] * ul_ref_sigs[u][v][0][1+(n<<1)] + (int32_t)alpha_im[alpha_ind] * ul_ref_sigs[u][v][0][n<<1])>>15);
@@ -563,48 +585,25 @@ void generate_pucch2x(int32_t **txdataF,
//LOG_I(PHY,"slot %d ofdm# %d ==> d[%d,%d] \n",ns,l,data_ind,n); //LOG_I(PHY,"slot %d ofdm# %d ==> d[%d,%d] \n",ns,l,data_ind,n);
} }
else { else {
if (l==1){ if ((l==1) || ( (l==5) && (fmt==pucch_format2) ))
((int16_t *)&zptr[n])[0] = ((int32_t)amp*ref_re>>15); {
((int16_t *)&zptr[n])[1] = ((int32_t)amp*ref_im>>15); ((int16_t *)&zptr[n])[0] = ((int32_t)amp*ref_re>>15);
} ((int16_t *)&zptr[n])[1] = ((int32_t)amp*ref_im>>15);
else if (fmt==pucch_format2a) { }
d[20]=amp; // l == 5 && pucch format 2a
d[21]=amp; else if (fmt==pucch_format2a)
if (B2 == 0) { {
((int16_t *)&zptr[n])[0] = ((int32_t)amp*ref_re>>15); ((int16_t *)&zptr[n])[0] = ((int32_t)d[20]*ref_re>>15);
((int16_t *)&zptr[n])[1] = ((int32_t)amp*ref_im>>15); ((int16_t *)&zptr[n])[1] = ((int32_t)d[21]*ref_im>>15);
} }
else { // l == 5 && pucch format 2b
((int16_t *)&zptr[n])[0] = -((int32_t)amp*ref_re>>15); else if (fmt==pucch_format2b)
((int16_t *)&zptr[n])[1] = -((int32_t)amp*ref_im>>15); {
} ((int16_t *)&zptr[n])[0] = ((int32_t)d[20]*ref_re>>15);
//LOG_I(PHY,"slot %d ofdm# %d ==> dmrs[%d] \n",ns,l,n); ((int16_t *)&zptr[n])[1] = ((int32_t)d[21]*ref_im>>15);
} }
else if (fmt==pucch_format2b) { } // l==1 || l==5
switch (B2) { alpha_ind = (alpha_ind + n_cs)%12;
case 0: // 1
((int16_t *)&zptr[n])[0] = ((int32_t)amp*ref_re>>15);
((int16_t *)&zptr[n])[1] = ((int32_t)amp*ref_im>>15);
break;
case 1: // -j
((int16_t *)&zptr[n])[1] = ((int32_t)amp*ref_re>>15);
((int16_t *)&zptr[n])[0] = -((int32_t)amp*ref_im>>15);
break;
case 2: // -1
((int16_t *)&zptr[n])[0] = -((int32_t)amp*ref_re>>15);
((int16_t *)&zptr[n])[1] = -((int32_t)amp*ref_im>>15);
break;
case 3: // j
((int16_t *)&zptr[n])[1] = -((int32_t)amp*ref_re>>15);
((int16_t *)&zptr[n])[0] = ((int32_t)amp*ref_im>>15);
break;
default:
AssertFatal(1==0,"Illegal modulation symbol %d for PUCCH %s\n",B2,pucch_format_string[fmt]);
break;
}
}// fmt==pucch_format2b
}// l==1 || l==5
alpha_ind = (alpha_ind + n_cs)%12;
} // n } // n
zptr+=12; zptr+=12;