Commit 0a0b6533 authored by David Kim's avatar David Kim

Type conversion for the unconverted variables.

parent 7858c772
...@@ -54,7 +54,7 @@ int nr_sl_generate_pss(c16_t *txdataF, ...@@ -54,7 +54,7 @@ int nr_sl_generate_pss(c16_t *txdataF,
LOG_I(NR_PHY, "Nid_SL %d, Nid2 %d\n", frame_parms->Nid_SL, Nid2); LOG_I(NR_PHY, "Nid_SL %d, Nid2 %d\n", frame_parms->Nid_SL, Nid2);
int16_t d_pss[LENGTH_PSS_NR]; int16_t d_pss[LENGTH_PSS_NR];
c16_t *primary_synchro = primary_synchro_nr[Nid2]; c16_t *primary_synchro = primary_synchro_nr[Nid2];
c16_t *primary_synchro2 = primary_synchro_nr2[Nid2]; int16_t *primary_synchro2 = primary_synchro_nr2[Nid2];
// PSS occupies a predefined position (subcarriers 2-128, symbol 0) within the SSB block starting from // PSS occupies a predefined position (subcarriers 2-128, symbol 0) within the SSB block starting from
int k = frame_parms->first_carrier_offset + frame_parms->ssb_start_subcarrier + PSS_SSS_SUB_CARRIER_START_SL; int k = frame_parms->first_carrier_offset + frame_parms->ssb_start_subcarrier + PSS_SSS_SUB_CARRIER_START_SL;
...@@ -68,8 +68,7 @@ int nr_sl_generate_pss(c16_t *txdataF, ...@@ -68,8 +68,7 @@ int nr_sl_generate_pss(c16_t *txdataF,
txdataF[(l * frame_parms->ofdm_symbol_size + k)].i = 0; txdataF[(l * frame_parms->ofdm_symbol_size + k)].i = 0;
primary_synchro[i].r = (d_pss[i] * SHRT_MAX) >> SCALING_PSS_NR; primary_synchro[i].r = (d_pss[i] * SHRT_MAX) >> SCALING_PSS_NR;
primary_synchro[i].i = 0; primary_synchro[i].i = 0;
primary_synchro2[i].r = d_pss[i]; primary_synchro2[i] = d_pss[i];
primary_synchro2[i].i = d_pss[i];
k++; k++;
if (k >= frame_parms->ofdm_symbol_size) if (k >= frame_parms->ofdm_symbol_size)
......
...@@ -191,7 +191,7 @@ int pss_sl_ch_est_nr(PHY_VARS_NR_UE *ue, ...@@ -191,7 +191,7 @@ int pss_sl_ch_est_nr(PHY_VARS_NR_UE *ue,
c16_t sss1_ext[NB_ANTENNAS_RX][LENGTH_SSS_NR]) c16_t sss1_ext[NB_ANTENNAS_RX][LENGTH_SSS_NR])
{ {
int id = get_softmodem_params()->sl_mode == 0 ? ue->common_vars.eNb_id : ue->common_vars.N2_id; int id = get_softmodem_params()->sl_mode == 0 ? ue->common_vars.eNb_id : ue->common_vars.N2_id;
c16_t *pss = primary_synchro_nr2[id]; int16_t *pss = primary_synchro_nr2[id];
c16_t tmp, tmp2; c16_t tmp, tmp2;
c16_t *sss0_ext3 = &sss0_ext[0][0]; c16_t *sss0_ext3 = &sss0_ext[0][0];
for (uint8_t aarx = 0; aarx < ue->frame_parms.nb_antennas_rx; aarx++) { for (uint8_t aarx = 0; aarx < ue->frame_parms.nb_antennas_rx; aarx++) {
...@@ -199,8 +199,8 @@ int pss_sl_ch_est_nr(PHY_VARS_NR_UE *ue, ...@@ -199,8 +199,8 @@ int pss_sl_ch_est_nr(PHY_VARS_NR_UE *ue,
c16_t *pss0_ext2 = &pss0_ext[aarx][0]; c16_t *pss0_ext2 = &pss0_ext[aarx][0];
for (uint8_t i = 0; i < LENGTH_PSS_NR; i++) { for (uint8_t i = 0; i < LENGTH_PSS_NR; i++) {
// This is H*(PSS) = R* \cdot PSS // This is H*(PSS) = R* \cdot PSS
tmp.r = (int16_t)((((int32_t)pss0_ext2[i].r) * pss[i].r)>>15); tmp.r = (int16_t)((((int32_t)pss0_ext2[i].r) * pss[i])>>15);
tmp.i = 0;//-pss0_ext2[i].i * pss[i].i; tmp.i = 0;//-pss0_ext2[i].i * pss[i];
int32_t amp = (((int32_t)tmp.r) * tmp.r) + ((int32_t)tmp.i) * tmp.i; int32_t amp = (((int32_t)tmp.r) * tmp.r) + ((int32_t)tmp.i) * tmp.i;
int shift = log2_approx(amp) / 2; int shift = log2_approx(amp) / 2;
...@@ -224,8 +224,8 @@ int pss_sl_ch_est_nr(PHY_VARS_NR_UE *ue, ...@@ -224,8 +224,8 @@ int pss_sl_ch_est_nr(PHY_VARS_NR_UE *ue,
c16_t *pss1_ext2 = &pss1_ext[aarx][0]; c16_t *pss1_ext2 = &pss1_ext[aarx][0];
for (uint8_t i = 0; i < LENGTH_PSS_NR; i++) { for (uint8_t i = 0; i < LENGTH_PSS_NR; i++) {
// This is H*(PSS) = R* \cdot PSS // This is H*(PSS) = R* \cdot PSS
tmp.r = pss1_ext2[i].r * pss[i].r; tmp.r = pss1_ext2[i].r * pss[i];
tmp.i = -pss1_ext2[i].i * pss[i].i; tmp.i = -pss1_ext2[i].i * pss[i];
int32_t amp = (((int32_t)tmp.r) * tmp.r) + ((int32_t)tmp.i) * tmp.i; int32_t amp = (((int32_t)tmp.r) * tmp.r) + ((int32_t)tmp.i) * tmp.i;
int shift = log2_approx(amp) / 2; int shift = log2_approx(amp) / 2;
// This is R(SSS) \cdot H*(PSS) // This is R(SSS) \cdot H*(PSS)
......
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