Commit 6f691176 authored by lfarizav's avatar lfarizav

Solving malloc error for PRACH channel in the frequency domain

parent ee1c50d4
...@@ -477,11 +477,11 @@ int init_freq_channel_prach(channel_desc_t *desc,uint16_t nb_rb,int16_t n_sample ...@@ -477,11 +477,11 @@ int init_freq_channel_prach(channel_desc_t *desc,uint16_t nb_rb,int16_t n_sample
prach_samples = (prach_fmt<4)?13+839+12:3+139+2; prach_samples = (prach_fmt<4)?13+839+12:3+139+2;
if (first_run) if (first_run)
{ {
cos_lut_f_prach = (float **)malloc16(prach_samples*sizeof(float*)); cos_lut_f_prach = (float **)malloc16((int)desc->nb_taps*sizeof(float*));
sin_lut_f_prach = (float **)malloc16(prach_samples*sizeof(float*)); sin_lut_f_prach = (float **)malloc16((int)desc->nb_taps*sizeof(float*));
for (f=max_nb_rb_samples/2-prach_pbr_offset_samples,f1=0; f<max_nb_rb_samples/2-prach_pbr_offset_samples+prach_samples; f++,f1++) { for (f=0; f<prach_samples; f++) {
cos_lut_f_prach[f1] = (float *)malloc16_clear((int)desc->nb_taps*sizeof(float)); cos_lut_f_prach[f] = (float *)malloc16_clear(prach_samples*sizeof(float));
sin_lut_f_prach[f1] = (float *)malloc16_clear((int)desc->nb_taps*sizeof(float)); sin_lut_f_prach[f] = (float *)malloc16_clear(prach_samples*sizeof(float));
} }
first_run=0; first_run=0;
} }
...@@ -580,10 +580,10 @@ int init_freq_channel_prach_SSE_float(channel_desc_t *desc,uint16_t nb_rb,int16_ ...@@ -580,10 +580,10 @@ int init_freq_channel_prach_SSE_float(channel_desc_t *desc,uint16_t nb_rb,int16_
return(0); return(0);
} }
static int first_run=1;
int init_freq_channel_prach_AVX_float(channel_desc_t *desc,uint16_t nb_rb,int16_t n_samples,int16_t prach_fmt,int16_t n_ra_prb) int init_freq_channel_prach_AVX_float(channel_desc_t *desc,uint16_t nb_rb,int16_t n_samples,int16_t prach_fmt,int16_t n_ra_prb)
{ {
static int first_run=1;
float delta_f,twopi; // 90 kHz spacing float delta_f,twopi; // 90 kHz spacing
float delay; float delay;
int16_t f,f1; int16_t f,f1;
...@@ -602,15 +602,14 @@ int init_freq_channel_prach_AVX_float(channel_desc_t *desc,uint16_t nb_rb,int16_ ...@@ -602,15 +602,14 @@ int init_freq_channel_prach_AVX_float(channel_desc_t *desc,uint16_t nb_rb,int16_
prach_samples = (prach_fmt<4)?13+839+12:3+139+2; prach_samples = (prach_fmt<4)?13+839+12:3+139+2;
if (first_run) if (first_run)
{ {
cos_lut_f_prach = (float **)malloc16(prach_samples*sizeof(float*)); cos_lut_f_prach = (float **)malloc16((int)desc->nb_taps*sizeof(float*));
sin_lut_f_prach = (float **)malloc16(prach_samples*sizeof(float*)); sin_lut_f_prach = (float **)malloc16((int)desc->nb_taps*sizeof(float*));
for (f=max_nb_rb_samples/2-prach_pbr_offset_samples,f1=0; f<max_nb_rb_samples/2-prach_pbr_offset_samples+prach_samples; f++,f1++) { for (f=0; f<prach_samples; f++) {
cos_lut_f_prach[f1] = (float *)malloc16_clear((int)desc->nb_taps*sizeof(float)); cos_lut_f_prach[f] = (float *)malloc16_clear((int)prach_samples*sizeof(float));
sin_lut_f_prach[f1] = (float *)malloc16_clear((int)desc->nb_taps*sizeof(float)); sin_lut_f_prach[f] = (float *)malloc16_clear((int)prach_samples*sizeof(float));
} }
first_run=0; first_run=0;
} }
//cos_lut = (double **)malloc(prach_samples*sizeof(double*)); //cos_lut = (double **)malloc(prach_samples*sizeof(double*));
//sin_lut = (double **)malloc(prach_samples*sizeof(double*)); //sin_lut = (double **)malloc(prach_samples*sizeof(double*));
......
...@@ -267,6 +267,7 @@ rlc_am_receive_routing ( ...@@ -267,6 +267,7 @@ rlc_am_receive_routing (
AssertFatal( tb_size_in_bytes == 0, AssertFatal( tb_size_in_bytes == 0,
"Remaining %d bytes following a control PDU", "Remaining %d bytes following a control PDU",
tb_size_in_bytes); tb_size_in_bytes);
//if (tb_size_in_bytes == 0) printf("Remaining %d bytes following a control PDU",tb_size_in_bytes);
} }
LOG_D(RLC, PROTOCOL_RLC_AM_CTXT_FMT"[RX ROUTING] VR(R)=%03d VR(MR)=%03d\n", LOG_D(RLC, PROTOCOL_RLC_AM_CTXT_FMT"[RX ROUTING] VR(R)=%03d VR(MR)=%03d\n",
......
...@@ -1126,7 +1126,7 @@ void rx_rf(PHY_VARS_eNB *eNB,int *frame,int *subframe) { ...@@ -1126,7 +1126,7 @@ void rx_rf(PHY_VARS_eNB *eNB,int *frame,int *subframe) {
stop_meas(&softmodem_stats_rx_rf); stop_meas(&softmodem_stats_rx_rf);
if (proc->frame_rx==1020) print_meas(&softmodem_stats_rx_rf,"softmodem_stats_rx_rf",NULL,NULL); //if (proc->frame_rx==1020) print_meas(&softmodem_stats_rx_rf,"softmodem_stats_rx_rf",NULL,NULL);
} }
void rx_rf_freq(PHY_VARS_eNB *eNB,int *frame,int *subframe) { void rx_rf_freq(PHY_VARS_eNB *eNB,int *frame,int *subframe) {
start_meas(&softmodem_stats_rx_rf_freq); start_meas(&softmodem_stats_rx_rf_freq);
...@@ -1983,9 +1983,9 @@ static void* eNB_thread_single( void* param ) { ...@@ -1983,9 +1983,9 @@ static void* eNB_thread_single( void* param ) {
if (rxtx(eNB,proc_rxtx,"eNB_thread_single") < 0) break; if (rxtx(eNB,proc_rxtx,"eNB_thread_single") < 0) break;
stop_meas(&softmodem_stats_hw); stop_meas(&softmodem_stats_hw);
if (temp_f==3000) { /*if (temp_f==3000) {
print_opp_meas(); print_opp_meas();
} }*/
} }
......
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