mirror of https://github.com/PentHertz/srsLTE.git
Fixed simultaneous PHICH (ACK) and CQI request.
This commit is contained in:
parent
610edac801
commit
4949759cdc
|
@ -206,7 +206,7 @@ private:
|
||||||
{
|
{
|
||||||
if (ack) {
|
if (ack) {
|
||||||
if (grant) {
|
if (grant) {
|
||||||
if (grant->ndi[0] == get_ndi()) {
|
if (grant->ndi[0] == get_ndi() && grant->phy_grant.ul.mcs.tbs != 0) {
|
||||||
*ack = false;
|
*ack = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -215,7 +215,7 @@ private:
|
||||||
|
|
||||||
// Reset HARQ process if TB has changed
|
// Reset HARQ process if TB has changed
|
||||||
if (harq_feedback && has_grant() && grant) {
|
if (harq_feedback && has_grant() && grant) {
|
||||||
if (grant->n_bytes[0] != cur_grant.n_bytes[0] && cur_grant.n_bytes[0] > 0) {
|
if (grant->n_bytes[0] != cur_grant.n_bytes[0] && cur_grant.n_bytes[0] > 0 && grant->n_bytes[0] > 0) {
|
||||||
Debug("UL %d: Reset due to change of grant size last_grant=%d, new_grant=%d\n",
|
Debug("UL %d: Reset due to change of grant size last_grant=%d, new_grant=%d\n",
|
||||||
pid, cur_grant.n_bytes[0], grant->n_bytes[0]);
|
pid, cur_grant.n_bytes[0], grant->n_bytes[0]);
|
||||||
reset();
|
reset();
|
||||||
|
|
|
@ -931,7 +931,7 @@ void phch_worker::set_uci_aperiodic_cqi()
|
||||||
|
|
||||||
int cqi_len = srslte_cqi_value_pack(&cqi_report, uci_data.uci_cqi);
|
int cqi_len = srslte_cqi_value_pack(&cqi_report, uci_data.uci_cqi);
|
||||||
if (cqi_len < 0) {
|
if (cqi_len < 0) {
|
||||||
Error("Error packing CQI value (Aperiodic reporting mode RM31).");
|
Error("Error packing CQI value (Aperiodic reporting mode RM30).");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
uci_data.uci_cqi_len = (uint32_t) cqi_len;
|
uci_data.uci_cqi_len = (uint32_t) cqi_len;
|
||||||
|
@ -948,8 +948,8 @@ void phch_worker::set_uci_aperiodic_cqi()
|
||||||
uci_data.uci_ri_len = 0;
|
uci_data.uci_ri_len = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
Info("PUSCH: Aperiodic RM30 CQI=%s, SNR=%.1f dB, for %d subbands\n",
|
Info("PUSCH: Aperiodic RM30 CQI=%s, %sSNR=%.1f dB, for %d subbands\n",
|
||||||
(uci_data.uci_ri_len)?((uci_data.uci_ri == 0)?"ri=0, ":"ri=1, "):"", cqi_str, phy->avg_snr_db, cqi_report.subband_hl.N);
|
cqi_str, (uci_data.uci_ri_len)?((uci_data.uci_ri == 0)?"ri=0, ":"ri=1, "):"", phy->avg_snr_db, cqi_report.subband_hl.N);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case LIBLTE_RRC_CQI_REPORT_MODE_APERIODIC_RM31:
|
case LIBLTE_RRC_CQI_REPORT_MODE_APERIODIC_RM31:
|
||||||
|
|
Loading…
Reference in New Issue