maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '130-oai-ue-dft-segmentation-fault' into 'develop'

Browse Source 
Resolve "OAI-UE, DFT segmentation fault"

Closes #130

See merge request !42
This commit is contained in:
Rohit Gupta
2016-09-08 15:15:35 +02:00
parent 64cd0076ba a490f5c75d
commit 12a304e65c
1 changed files with 32 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair1/PHY/MODULATION/slot_fep_ul.c
+32 -19
View File
@@ -50,6 +50,10 @@ int slot_fep_ul(LTE_DL_FRAME_PARMS *frame_parms,
void (*dft)(int16_t *,int16_t *, int); void (*dft)(int16_t *,int16_t *, int);
int tmp_dft_in[2048] __attribute__ ((aligned (32))); // This is for misalignment issues for 6 and 15 PRBs
unsigned int frame_length_samples = frame_parms->samples_per_tti * 10;
unsigned int rx_offset;
switch (frame_parms->ofdm_symbol_size) { switch (frame_parms->ofdm_symbol_size) {
case 128: case 128:
dft = dft128; dft = dft128;
@@ -103,28 +107,37 @@ int slot_fep_ul(LTE_DL_FRAME_PARMS *frame_parms,
#endif #endif
for (aa=0; aa<frame_parms->nb_antennas_rx; aa++) { for (aa=0; aa<frame_parms->nb_antennas_rx; aa++) {
rx_offset = slot_offset +nb_prefix_samples0;
if (l==0) { if (l==0) {
dft( dft( (int16_t *)&eNB_common_vars->rxdata_7_5kHz[eNB_id][aa][rx_offset],
#ifndef OFDMA_ULSCH (int16_t *)&eNB_common_vars->rxdataF[eNB_id][aa][frame_parms->ofdm_symbol_size*symbol],
(int16_t *)&eNB_common_vars->rxdata_7_5kHz[eNB_id][aa][slot_offset + 1
nb_prefix_samples0], );
#else
(int16_t *)&eNB_common_vars->rxdata[eNB_id][aa][((frame_parms->samples_per_tti>>1)*Ns) +
nb_prefix_samples0],
#endif
(int16_t *)&eNB_common_vars->rxdataF[eNB_id][aa][frame_parms->ofdm_symbol_size*symbol],1);
} else { } else {
dft( rx_offset += (frame_parms->ofdm_symbol_size+nb_prefix_samples)*l;
#ifndef OFDMA_ULSCH if(rx_offset > (frame_length_samples - frame_parms->ofdm_symbol_size))
(short *)&eNB_common_vars->rxdata_7_5kHz[eNB_id][aa][slot_offset + {
#else memcpy((void *)&eNB_common_vars->rxdata_7_5kHz[eNB_id][aa][frame_length_samples],
(short *)&eNB_common_vars->rxdata[eNB_id][aa][((frame_parms->samples_per_tti>>1)*Ns) + (void *)&eNB_common_vars->rxdata_7_5kHz[eNB_id][aa][0],
#endif frame_parms->ofdm_symbol_size*sizeof(int));
(frame_parms->ofdm_symbol_size+nb_prefix_samples0+nb_prefix_samples) + }
(frame_parms->ofdm_symbol_size+nb_prefix_samples)*(l-1)],
(short*)&eNB_common_vars->rxdataF[eNB_id][aa][frame_parms->ofdm_symbol_size*symbol],1); if( (rx_offset & 7) != 0){
memcpy((void *)&tmp_dft_in,
(void *)&eNB_common_vars->rxdata_7_5kHz[eNB_id][aa][(rx_offset % frame_length_samples)],
frame_parms->ofdm_symbol_size*sizeof(int));
dft( (short *) tmp_dft_in,
(short*) &eNB_common_vars->rxdataF[eNB_id][aa][frame_parms->ofdm_symbol_size*symbol],
1
);
}
else{
dft( (short *)&eNB_common_vars->rxdata_7_5kHz[eNB_id][aa][rx_offset],
(short*)&eNB_common_vars->rxdataF[eNB_id][aa][frame_parms->ofdm_symbol_size*symbol],
1
);
}
} }
} }