mirror of https://github.com/PentHertz/srsLTE.git
Merge branch 'master' into uplink
This commit is contained in:
commit
c36dd98b47
|
@ -124,7 +124,7 @@ typedef struct SRSLTE_API {
|
|||
|
||||
uint32_t mcs_idx;
|
||||
uint32_t harq_process;
|
||||
uint32_t rv_idx;
|
||||
int rv_idx;
|
||||
bool ndi;
|
||||
} srslte_ra_dl_dci_t;
|
||||
|
||||
|
|
|
@ -141,11 +141,11 @@ bool srslte_cqi_send(uint32_t I_cqi_pmi, uint32_t tti) {
|
|||
/* SNR-to-CQI conversion, got from "Downlink SNR to CQI Mapping for Different Multiple Antenna Techniques in LTE"
|
||||
* Table III.
|
||||
*/
|
||||
// Original version
|
||||
//static float cqi_to_snr_table[15] = { 1.95, 4, 6, 8, 10, 11.95, 14.05, 16, 17.9, 19.9, 21.5, 23.45, 25.0, 27.30, 29};
|
||||
// From paper
|
||||
static float cqi_to_snr_table[15] = { 1.95, 4, 6, 8, 10, 11.95, 14.05, 16, 17.9, 19.9, 21.5, 23.45, 25.0, 27.30, 29};
|
||||
|
||||
// From experimental measurements @ 5 MHz
|
||||
static float cqi_to_snr_table[15] = { 1, 1.75, 3, 4, 5, 6, 7.5, 9, 11.5, 13.0, 15.0, 18, 20, 22.5, 26.5};
|
||||
//static float cqi_to_snr_table[15] = { 1, 1.75, 3, 4, 5, 6, 7.5, 9, 11.5, 13.0, 15.0, 18, 20, 22.5, 26.5};
|
||||
|
||||
uint8_t srslte_cqi_from_snr(float snr)
|
||||
{
|
||||
|
|
|
@ -818,6 +818,7 @@ int dci_format1Cs_unpack(srslte_dci_msg_t *msg, srslte_ra_dl_dci_t *data, uint32
|
|||
data->mcs_idx = srslte_bit_pack(&y, 5);
|
||||
|
||||
data->dci_format = SRSLTE_RA_DCI_FORMAT1C;
|
||||
data->rv_idx = -1; // For SI-RNTI, get RV from TTI
|
||||
|
||||
msg->nof_bits = (y - msg->data);
|
||||
|
||||
|
|
Loading…
Reference in New Issue