SRSUE: Remove UL hard-coded phase and more PUSCH logging info

master
Xavier Arteaga 4 years ago committed by David Rupprecht
parent 1fcd006a7c
commit 6ba9f8fd41

@ -466,7 +466,7 @@ static uint32_t srslte_dmrs_sch_seed(const srslte_carrier_nr_t* carrier,
} }
return SRSLTE_SEQUENCE_MOD((((SRSLTE_NSYMB_PER_SLOT_NR * slot_idx + symbol_idx + 1UL) * (2UL * n_id + 1UL)) << 17UL) + return SRSLTE_SEQUENCE_MOD((((SRSLTE_NSYMB_PER_SLOT_NR * slot_idx + symbol_idx + 1UL) * (2UL * n_id + 1UL)) << 17UL) +
(2UL * carrier->id + n_scid)); (2UL * n_id + n_scid));
} }
int srslte_dmrs_sch_init(srslte_dmrs_sch_t* q, bool is_rx) int srslte_dmrs_sch_init(srslte_dmrs_sch_t* q, bool is_rx)

@ -675,12 +675,23 @@ static uint32_t srslte_pusch_nr_grant_info(const srslte_sch_cfg_nr_t* cfg,
uint32_t len = 0; uint32_t len = 0;
len = srslte_print_check(str, str_len, len, "rnti=0x%x", grant->rnti); len = srslte_print_check(str, str_len, len, "rnti=0x%x", grant->rnti);
char freq_str[SRSLTE_MAX_PRB_NR + 1] = {};
for (uint32_t i = 0, nof_prb = 0; i < SRSLTE_MAX_PRB_NR && nof_prb < grant->nof_prb; i++) {
if (grant->prb_idx[i]) {
freq_str[i] = '1';
nof_prb++;
} else {
freq_str[i] = '0';
}
}
// Append time-domain resource mapping // Append time-domain resource mapping
len = srslte_print_check(str, len = srslte_print_check(str,
str_len, str_len,
len, len,
",k2=%d,S=%d,L=%d,mapping=%s", ",k2=%d,freq=%s,S=%d,L=%d,mapping=%s",
grant->k, grant->k,
freq_str,
grant->S, grant->S,
grant->L, grant->L,
srslte_sch_mapping_type_to_str(grant->mapping)); srslte_sch_mapping_type_to_str(grant->mapping));

@ -118,17 +118,6 @@ int srslte_ue_ul_nr_encode_pusch(srslte_ue_ul_nr_t* q,
return SRSLTE_ERROR; return SRSLTE_ERROR;
} }
// Temporary symbol phase shift
uint32_t nof_re = SRSLTE_NRE * q->carrier.nof_prb;
for (uint32_t i = 0; i < 2; i++) {
for (uint32_t j = 0; j < 7; j++) {
srslte_vec_sc_prod_ccc(&q->sf_symbols[0][(i * 7 + j) * nof_re],
cexpf(I * (11.0f * j - 2.0f) * M_PI / 16),
&q->sf_symbols[0][(i * 7 + j) * nof_re],
nof_re);
}
}
// Generate signal // Generate signal
srslte_ofdm_tx_sf(&q->ifft); srslte_ofdm_tx_sf(&q->ifft);

Loading…
Cancel
Save