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

fixing last commit

Browse Source
This commit is contained in:
Florian Kaltenberger
2015-12-02 11:25:16 +01:00
parent 992b32a969
commit e24847b130
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair1/PHY/LTE_TRANSPORT/proto.h
+1 -1
View File
@@ -1603,7 +1603,7 @@ uint16_t computeRIV(uint16_t N_RB_DL,uint16_t RBstart,uint16_t Lcrbs);
@param rank (0 or 1) @param rank (0 or 1)
@returns subband PMI bitmap @returns subband PMI bitmap
*/ */
uint32_t pmi_extend(LTE_DL_FRAME_PARMS *frame_parms,uint8_t wideband_pmi, unit8_t rank); uint32_t pmi_extend(LTE_DL_FRAME_PARMS *frame_parms,uint8_t wideband_pmi, uint8_t rank);
/** \brief This routine extracts a single subband PMI from a bitmap coming from UCI or the pmi_extend function /** \brief This routine extracts a single subband PMI from a bitmap coming from UCI or the pmi_extend function
@param N_RB_DL number of resource blocks @param N_RB_DL number of resource blocks
openair1/PHY/LTE_TRANSPORT/uci_tools.c
+3 -1
View File
@@ -178,6 +178,7 @@ void extract_CQI(void *o,UCI_format_t uci_format,LTE_eNB_UE_stats *stats, uint8_
//unsigned char rank; //unsigned char rank;
//UCI_format fmt; //UCI_format fmt;
//uint8_t N_RB_DL = 25; //uint8_t N_RB_DL = 25;
uint8_t i;
LOG_D(PHY,"[eNB][UCI] N_RB_DL %d uci format %d\n", N_RB_DL,uci_format); LOG_D(PHY,"[eNB][UCI] N_RB_DL %d uci format %d\n", N_RB_DL,uci_format);
switch(N_RB_DL) { switch(N_RB_DL) {
@@ -287,8 +288,9 @@ void extract_CQI(void *o,UCI_format_t uci_format,LTE_eNB_UE_stats *stats, uint8_
stats->DL_pmi_dual = ((wideband_cqi_rank2_2A_5MHz *)o)->pmi; stats->DL_pmi_dual = ((wideband_cqi_rank2_2A_5MHz *)o)->pmi;
//this translates the 2-layer PMI into a single layer PMI for the first codeword //this translates the 2-layer PMI into a single layer PMI for the first codeword
//the PMI for the second codeword will be stats->DL_pmi_single^0x1555 //the PMI for the second codeword will be stats->DL_pmi_single^0x1555
stats->DL_pmi_single = 0;
for (i=0;i<7;i++) for (i=0;i<7;i++)
stats->DL_pmi_single&(1<<(2*i)) = (stats->DL_pmi_dual&(1<i))*2; stats->DL_pmi_single = stats->DL_pmi_single | (((stats->DL_pmi_dual&(1<i))>>i)*2)<<2*i;
break; break;
case HLC_subband_cqi_nopmi: case HLC_subband_cqi_nopmi: