PentHertz
/
srsLTE
mirror of https://github.com/PentHertz/srsLTE.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove remaining const_casts

This commit is contained in:
Francisco Paisana 2020-03-05 18:55:54 +00:00
parent ec1f1cc677
commit a6320f93b8
2 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/include/srslte/phy/phch/ra_dl.h
View File

@ -44,15 +44,15 @@
**************************************************/ **************************************************/
/** Functions to generate a grant from a received DCI */ /** Functions to generate a grant from a received DCI */
SRSLTE_API int srslte_ra_dl_dci_to_grant(const srslte_cell_t* cell, SRSLTE_API int srslte_ra_dl_dci_to_grant(const srslte_cell_t* cell,
srslte_dl_sf_cfg_t* sf, srslte_dl_sf_cfg_t* sf,
srslte_tm_t tm, srslte_tm_t tm,
bool pdsch_use_tbs_index_alt, bool pdsch_use_tbs_index_alt,
srslte_dci_dl_t* dci, const srslte_dci_dl_t* dci,
srslte_pdsch_grant_t* grant); srslte_pdsch_grant_t* grant);
SRSLTE_API int SRSLTE_API int
srslte_ra_dl_grant_to_grant_prb_allocation(srslte_dci_dl_t* dci, srslte_pdsch_grant_t* grant, uint32_t nof_prb); srslte_ra_dl_grant_to_grant_prb_allocation(const srslte_dci_dl_t* dci, srslte_pdsch_grant_t* grant, uint32_t nof_prb);
/** Functions used by the eNodeB scheduler */ /** Functions used by the eNodeB scheduler */
SRSLTE_API uint32_t srslte_ra_dl_approx_nof_re(srslte_cell_t* cell, uint32_t nof_prb, uint32_t nof_ctrl_symbols); SRSLTE_API uint32_t srslte_ra_dl_approx_nof_re(srslte_cell_t* cell, uint32_t nof_prb, uint32_t nof_ctrl_symbols);

27
lib/src/phy/phch/ra_dl.c
View File

@ -166,7 +166,9 @@ static uint32_t ra_re_x_prb(const srslte_cell_t* cell, srslte_dl_sf_cfg_t* sf, u
* This function only writes grant->prb_idx and grant->nof_prb. * This function only writes grant->prb_idx and grant->nof_prb.
*/ */
/** Compute PRB allocation for Downlink as defined in 7.1.6 of 36.213 */ /** Compute PRB allocation for Downlink as defined in 7.1.6 of 36.213 */
int srslte_ra_dl_grant_to_grant_prb_allocation(srslte_dci_dl_t* dci, srslte_pdsch_grant_t* grant, uint32_t nof_prb) int srslte_ra_dl_grant_to_grant_prb_allocation(const srslte_dci_dl_t* dci,
srslte_pdsch_grant_t* grant,
uint32_t nof_prb)
{ {
int i, j; int i, j;
uint32_t bitmask; uint32_t bitmask;
@ -373,7 +375,7 @@ int srslte_dl_fill_ra_mcs(srslte_ra_tb_t* tb, int last_tbs, uint32_t nprb, bool
/* Modulation order and transport block size determination 7.1.7 in 36.213 /* Modulation order and transport block size determination 7.1.7 in 36.213
* */ * */
static int dl_dci_compute_tb(bool pdsch_use_tbs_index_alt, srslte_dci_dl_t* dci, srslte_pdsch_grant_t* grant) static int dl_dci_compute_tb(bool pdsch_use_tbs_index_alt, const srslte_dci_dl_t* dci, srslte_pdsch_grant_t* grant)
{ {
uint32_t n_prb = 0; uint32_t n_prb = 0;
int tbs = -1; int tbs = -1;
@ -469,7 +471,7 @@ void srslte_ra_dl_compute_nof_re(const srslte_cell_t* cell, srslte_dl_sf_cfg_t*
/* Determine MIMO type based on number of cell ports and receive antennas, transport blocks and pinfo */ /* Determine MIMO type based on number of cell ports and receive antennas, transport blocks and pinfo */
static int static int
config_mimo_type(const srslte_cell_t* cell, srslte_tm_t tm, srslte_dci_dl_t* dci, srslte_pdsch_grant_t* grant) config_mimo_type(const srslte_cell_t* cell, srslte_tm_t tm, const srslte_dci_dl_t* dci, srslte_pdsch_grant_t* grant)
{ {
grant->tx_scheme = SRSLTE_TXSCHEME_PORT0; grant->tx_scheme = SRSLTE_TXSCHEME_PORT0;
bool valid_config = true; bool valid_config = true;
@ -526,7 +528,7 @@ config_mimo_type(const srslte_cell_t* cell, srslte_tm_t tm, srslte_dci_dl_t* dci
} }
/* Translates Precoding Information (pinfo) to Precoding matrix Index (pmi) as 3GPP 36.212 Table 5.3.3.1.5-4 */ /* Translates Precoding Information (pinfo) to Precoding matrix Index (pmi) as 3GPP 36.212 Table 5.3.3.1.5-4 */
static int config_mimo_pmi(const srslte_cell_t* cell, srslte_dci_dl_t* dci, srslte_pdsch_grant_t* grant) static int config_mimo_pmi(const srslte_cell_t* cell, const srslte_dci_dl_t* dci, srslte_pdsch_grant_t* grant)
{ {
uint32_t nof_tb = grant->nof_tb; uint32_t nof_tb = grant->nof_tb;
if (grant->tx_scheme == SRSLTE_TXSCHEME_SPATIALMUX) { if (grant->tx_scheme == SRSLTE_TXSCHEME_SPATIALMUX) {
@ -557,7 +559,7 @@ static int config_mimo_pmi(const srslte_cell_t* cell, srslte_dci_dl_t* dci, srsl
} }
/* Determine number of MIMO layers */ /* Determine number of MIMO layers */
static int config_mimo_layers(const srslte_cell_t* cell, srslte_dci_dl_t* dci, srslte_pdsch_grant_t* grant) static int config_mimo_layers(const srslte_cell_t* cell, const srslte_dci_dl_t* dci, srslte_pdsch_grant_t* grant)
{ {
uint32_t nof_tb = grant->nof_tb; uint32_t nof_tb = grant->nof_tb;
switch (grant->tx_scheme) { switch (grant->tx_scheme) {
@ -600,7 +602,8 @@ static int config_mimo_layers(const srslte_cell_t* cell, srslte_dci_dl_t* dci, s
return 0; return 0;
} }
static int config_mimo(const srslte_cell_t* cell, srslte_tm_t tm, srslte_dci_dl_t* dci, srslte_pdsch_grant_t* grant) static int
config_mimo(const srslte_cell_t* cell, srslte_tm_t tm, const srslte_dci_dl_t* dci, srslte_pdsch_grant_t* grant)
{ {
if (config_mimo_type(cell, tm, dci, grant)) { if (config_mimo_type(cell, tm, dci, grant)) {
@ -627,12 +630,12 @@ static int config_mimo(const srslte_cell_t* cell, srslte_tm_t tm, srslte_dci_dl_
**********/ **********/
/** Compute the DL grant parameters */ /** Compute the DL grant parameters */
int srslte_ra_dl_dci_to_grant(const srslte_cell_t* cell, int srslte_ra_dl_dci_to_grant(const srslte_cell_t* cell,
srslte_dl_sf_cfg_t* sf, srslte_dl_sf_cfg_t* sf,
srslte_tm_t tm, srslte_tm_t tm,
bool pdsch_use_tbs_index_alt, bool pdsch_use_tbs_index_alt,
srslte_dci_dl_t* dci, const srslte_dci_dl_t* dci,
srslte_pdsch_grant_t* grant) srslte_pdsch_grant_t* grant)
{ {
bzero(grant, sizeof(srslte_pdsch_grant_t)); bzero(grant, sizeof(srslte_pdsch_grant_t));