Commit 6f09de5b authored by Cedric Roux's avatar Cedric Roux

extract correct CQI when 2 CCs are configured

parent 37886d72
...@@ -289,7 +289,7 @@ void extract_CQI(void *o,UCI_format_t uci_format,LTE_eNB_UE_stats *stats, uint8_ ...@@ -289,7 +289,7 @@ void extract_CQI(void *o,UCI_format_t uci_format,LTE_eNB_UE_stats *stats, uint8_
break; break;
case HLC_subband_cqi_nopmi: case HLC_subband_cqi_nopmi:
if (1 || N_CC == 1) { if (N_CC == 1) {
stats->DL_cqi[0] = (((HLC_subband_cqi_nopmi_5MHz *)o)->cqi1); stats->DL_cqi[0] = (((HLC_subband_cqi_nopmi_5MHz *)o)->cqi1);
if (stats->DL_cqi[0] > 24) if (stats->DL_cqi[0] > 24)
...@@ -301,7 +301,12 @@ void extract_CQI(void *o,UCI_format_t uci_format,LTE_eNB_UE_stats *stats, uint8_ ...@@ -301,7 +301,12 @@ void extract_CQI(void *o,UCI_format_t uci_format,LTE_eNB_UE_stats *stats, uint8_
if (stats->DL_cqi[0] > 24) if (stats->DL_cqi[0] > 24)
stats->DL_cqi[0] = 24; stats->DL_cqi[0] = 24;
do_diff_cqi(N_RB_DL,stats->DL_subband_cqi[0],stats->DL_cqi[0],((HLC_subband_cqi_nopmi_2CC_5MHz *)o)->diffcqi1); do_diff_cqi(N_RB_DL,stats->DL_subband_cqi[0],stats->DL_cqi[0],((HLC_subband_cqi_nopmi_2CC_5MHz *)o)->diffcqi1);
/* CROUX TODO 2nd CQI info */
stats->DL_cqi[1] = (((HLC_subband_cqi_nopmi_2CC_5MHz *)o)->cqi2);
if (stats->DL_cqi[1] > 24)
stats->DL_cqi[1] = 24;
do_diff_cqi(N_RB_DL,stats->DL_subband_cqi[1],stats->DL_cqi[1],((HLC_subband_cqi_nopmi_2CC_5MHz *)o)->diffcqi2);
printf("special CQI!!\n"); printf("special CQI!!\n");
} }
break; break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment