Skip to content

O
OpenXG-RAN
Commit aaaa6d5c authored by frtabu's avatar frtabu
Browse files
Options

more cppcheck fixes

parent 5490d3e7
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 326 additions and 324 deletions
openair1/PHY/NR_UE_TRANSPORT/dci_nr.c
View file @ aaaa6d5c
...@@ -253,6 +253,7 @@ void pdcch_channel_level(int32_t **dl_ch_estimates_ext, ...@@ -253,6 +253,7 @@ void pdcch_channel_level(int32_t **dl_ch_estimates_ext,
avg128P = _mm_setzero_si128(); avg128P = _mm_setzero_si128();
dl_ch128=(__m128i *)&dl_ch_estimates_ext[aarx][0]; dl_ch128=(__m128i *)&dl_ch_estimates_ext[aarx][0];
#elif defined(__arm__) #elif defined(__arm__)
dl_ch128=(int16x8_t *)&dl_ch_estimates_ext[aarx][0];
#endif #endif
for (rb=0; rb<(nb_rb*3)>>2; rb++) { for (rb=0; rb<(nb_rb*3)>>2; rb++) {
...@@ -375,7 +376,7 @@ void nr_pdcch_extract_rbs_single(int32_t **rxdataF, ...@@ -375,7 +376,7 @@ void nr_pdcch_extract_rbs_single(int32_t **rxdataF,
* then the IQ symbol is going to be found at the position 0+c_rb-N_RB_DL/2 in rxdataF and * then the IQ symbol is going to be found at the position 0+c_rb-N_RB_DL/2 in rxdataF and
* we have to point the pointer at (1+c_rb-N_RB_DL/2) in rxdataF * we have to point the pointer at (1+c_rb-N_RB_DL/2) in rxdataF
*/ */
LOG_DDD("n_BWP_start=%d, coreset_nbr_rb=%d\n",n_BWP_start,coreset_nbr_rb); LOG_DDD("n_BWP_start=%u, coreset_nbr_rb=%u\n",n_BWP_start,coreset_nbr_rb);
for (c_rb = n_BWP_start; c_rb < (n_BWP_start + coreset_nbr_rb + (BIT_TO_NBR_RB_CORESET_FREQ_DOMAIN * offset_discontiguous)); c_rb++) { for (c_rb = n_BWP_start; c_rb < (n_BWP_start + coreset_nbr_rb + (BIT_TO_NBR_RB_CORESET_FREQ_DOMAIN * offset_discontiguous)); c_rb++) {
//c_rb_tmp = 0; //c_rb_tmp = 0;
...@@ -762,8 +763,8 @@ int32_t nr_rx_pdcch(PHY_VARS_NR_UE *ue, ...@@ -762,8 +763,8 @@ int32_t nr_rx_pdcch(PHY_VARS_NR_UE *ue,
} }
} }
LOG_DD("symbol_mon=(%d) and start_symbol=(%d)\n",symbol_mon,start_symbol); LOG_DD("symbol_mon=(%u) and start_symbol=(%u)\n",symbol_mon,start_symbol);
LOG_DD("coreset_freq_dom=(%ld) n_rb_offset=(%d) coreset_time_dur=(%d) n_shift=(%d) reg_bundle_size_L=(%d) coreset_interleaver_size_R=(%d) scrambling_ID=(%d) \n", LOG_DD("coreset_freq_dom=(%lu) n_rb_offset=(%u) coreset_time_dur=(%d) n_shift=(%d) reg_bundle_size_L=(%d) coreset_interleaver_size_R=(%d) scrambling_ID=(%d) \n",
coreset_freq_dom,n_rb_offset,coreset_time_dur,n_shift,reg_bundle_size_L,coreset_interleaver_size_R,pdcch_DMRS_scrambling_id); coreset_freq_dom,n_rb_offset,coreset_time_dur,n_shift,reg_bundle_size_L,coreset_interleaver_size_R,pdcch_DMRS_scrambling_id);
// //
// according to 38.213 v15.1.0: a PDCCH monitoring pattern within a slot, // according to 38.213 v15.1.0: a PDCCH monitoring pattern within a slot,
...@@ -780,7 +781,7 @@ int32_t nr_rx_pdcch(PHY_VARS_NR_UE *ue, ...@@ -780,7 +781,7 @@ int32_t nr_rx_pdcch(PHY_VARS_NR_UE *ue,
// for (int j=0; j < coreset_nbr_act; j++) { // for (int j=0; j < coreset_nbr_act; j++) {
// for each active CORESET (max number of active CORESETs in a BWP is 3), // for each active CORESET (max number of active CORESETs in a BWP is 3),
// we calculate the number of RB for each CORESET bitmap // we calculate the number of RB for each CORESET bitmap
LOG_DD("coreset_freq_dom=(%ld)\n",coreset_freq_dom); LOG_DD("coreset_freq_dom=(%lu)\n",coreset_freq_dom);
int i; //for each bit in the coreset_freq_dom bitmap int i; //for each bit in the coreset_freq_dom bitmap
for (i = 0; i < 45; i++) { for (i = 0; i < 45; i++) {
...@@ -789,8 +790,8 @@ int32_t nr_rx_pdcch(PHY_VARS_NR_UE *ue, ...@@ -789,8 +790,8 @@ int32_t nr_rx_pdcch(PHY_VARS_NR_UE *ue,
} }
coreset_nbr_rb = 6 * coreset_nbr_rb; // coreset_nbr_rb has to be multiplied by 6 to indicate the number of PRB or REG(=12 RE) within the CORESET coreset_nbr_rb = 6 * coreset_nbr_rb; // coreset_nbr_rb has to be multiplied by 6 to indicate the number of PRB or REG(=12 RE) within the CORESET
LOG_DD("coreset_freq_dom=(%ld,%lx), coreset_nbr_rb=%d\n", coreset_freq_dom,coreset_freq_dom,coreset_nbr_rb); LOG_DD("coreset_freq_dom=(%lu,%lx), coreset_nbr_rb=%u\n", coreset_freq_dom,coreset_freq_dom,coreset_nbr_rb);
LOG_DD("coreset_nbr_rb=%d, coreset_nbr_reg=%d, coreset_C=(%d/(%d*%d))=%d\n", LOG_DD("coreset_nbr_rb=%u, coreset_nbr_reg=%u, coreset_C=(%u/(%d*%d))=%u\n",
coreset_nbr_rb, coreset_nbr_rb,
coreset_time_dur * coreset_nbr_rb, coreset_time_dur * coreset_nbr_rb,
coreset_time_dur * coreset_nbr_rb, coreset_time_dur * coreset_nbr_rb,
...@@ -1163,9 +1164,9 @@ void nr_dci_decoding_procedure0(int s, ...@@ -1163,9 +1164,9 @@ void nr_dci_decoding_procedure0(int s,
LOG_DDD("debug1(%d)=nCCE[p]/L2 | nCCE[%d](%d) | L2(%d)\n",nCCE[p] / L2,p,nCCE[p],L2); LOG_DDD("debug1(%d)=nCCE[p]/L2 | nCCE[%d](%d) | L2(%d)\n",nCCE[p] / L2,p,nCCE[p],L2);
LOG_DDD("debug2(%d)=L2*m_p_s_L_max | L2(%d) | m_p_s_L_max(%d)\n",L2*m_p_s_L_max,L2,m_p_s_L_max); LOG_DDD("debug2(%d)=L2*m_p_s_L_max | L2(%d) | m_p_s_L_max(%d)\n",L2*m_p_s_L_max,L2,m_p_s_L_max);
CCEind = (((Yk + (uint16_t)(floor((m*nCCE[p])/(L2*m_p_s_L_max))) + n_ci) % (uint16_t)(floor(nCCE[p] / L2))) * L2); CCEind = (((Yk + (uint16_t)(floor((m*nCCE[p])/(L2*m_p_s_L_max))) + n_ci) % (uint16_t)(floor(nCCE[p] / L2))) * L2);
LOG_DDD("CCEind(%d) = (((Yk(%u) + ((m(%u)*nCCE[p](%d))/(L2(%d)*m_p_s_L_max(%d)))) %% (nCCE[p] / L2)) * L2)\n", LOG_DDD("CCEind(%u) = (((Yk(%u) + ((m(%u)*nCCE[p](%u))/(L2(%d)*m_p_s_L_max(%d)))) %% (nCCE[p] / L2)) * L2)\n",
CCEind,Yk,m,nCCE[p],L2,m_p_s_L_max); CCEind,Yk,m,nCCE[p],L2,m_p_s_L_max);
LOG_DDD("n_candidate(m)=%u | CCEind=%d |",m,CCEind); LOG_DDD("n_candidate(m)=%u | CCEind=%u |",m,CCEind);
if (CCEind < 32) if (CCEind < 32)
CCEmap = CCEmap0; CCEmap = CCEmap0;
...@@ -1173,7 +1174,7 @@ void nr_dci_decoding_procedure0(int s, ...@@ -1173,7 +1174,7 @@ void nr_dci_decoding_procedure0(int s,
CCEmap = CCEmap1; CCEmap = CCEmap1;
else if (CCEind < 96) else if (CCEind < 96)
CCEmap = CCEmap2; CCEmap = CCEmap2;
else AssertFatal(1==0,"Illegal CCEind %d (Yk %u, m %u, nCCE %d, L2 %d\n", CCEind, Yk, m, nCCE[p], L2); else AssertFatal(1==0,"Illegal CCEind %u (Yk %u, m %u, nCCE %u, L2 %u\n", CCEind, Yk, m, nCCE[p], L2);
switch (L2) { switch (L2) {
case 1: case 1:
...@@ -1220,7 +1221,7 @@ void nr_dci_decoding_procedure0(int s, ...@@ -1220,7 +1221,7 @@ void nr_dci_decoding_procedure0(int s,
LOG_DDD("... we enter function dci_decoding(sizeof_bits=%d L=%d) -----\n",sizeof_bits,L); LOG_DDD("... we enter function dci_decoding(sizeof_bits=%d L=%d) -----\n",sizeof_bits,L);
LOG_DDD("... we have to replace this part of the code by polar decoding\n"); LOG_DDD("... we have to replace this part of the code by polar decoding\n");
// for (int m=0; m < (nCCE[p]*6*9*2); m++) // for (int m=0; m < (nCCE[p]*6*9*2); m++)
LOG_DDD("(polar decoding)-> polar intput (with coreset_time_dur=%d, coreset_nbr_rb=%d, p=%d, CCEind=%d): \n", LOG_DDD("(polar decoding)-> polar intput (with coreset_time_dur=%d, coreset_nbr_rb=%d, p=%d, CCEind=%u): \n",
coreset_time_dur,coreset_nbr_rb,p,CCEind); coreset_time_dur,coreset_nbr_rb,p,CCEind);
/* /*
int reg_p=0,reg_e=0; int reg_p=0,reg_e=0;
......
openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c
View file @ aaaa6d5c
...@@ -380,10 +380,10 @@ int nr_rx_pdsch(PHY_VARS_NR_UE *ue, ...@@ -380,10 +380,10 @@ int nr_rx_pdsch(PHY_VARS_NR_UE *ue,
#if UE_TIMING_TRACE #if UE_TIMING_TRACE
stop_meas(&ue->generic_stat_bis[ue->current_thread_id[nr_tti_rx]][slot]); stop_meas(&ue->generic_stat_bis[ue->current_thread_id[nr_tti_rx]][slot]);
#if DISABLE_LOG_X #if DISABLE_LOG_X
printf("[AbsSFN %d.%d] Slot%d Symbol %d Flag %d type %d: Pilot/Data extraction %5.2f \n", printf("[AbsSFN %u.%d] Slot%d Symbol %d Flag %d type %d: Pilot/Data extraction %5.2f \n",
frame,nr_tti_rx,slot,symbol,ue->high_speed_flag,type,ue->generic_stat_bis[ue->current_thread_id[nr_tti_rx]][slot].p_time/(cpuf*1000.0)); frame,nr_tti_rx,slot,symbol,ue->high_speed_flag,type,ue->generic_stat_bis[ue->current_thread_id[nr_tti_rx]][slot].p_time/(cpuf*1000.0));
#else #else
LOG_I(PHY, "[AbsSFN %d.%d] Slot%d Symbol %d Flag %d type %d: Pilot/Data extraction %5.2f \n", LOG_I(PHY, "[AbsSFN %u.%d] Slot%d Symbol %d Flag %d type %d: Pilot/Data extraction %5.2f \n",
frame,nr_tti_rx,slot,symbol,ue->high_speed_flag,type,ue->generic_stat_bis[ue->current_thread_id[nr_tti_rx]][slot].p_time/(cpuf*1000.0)); frame,nr_tti_rx,slot,symbol,ue->high_speed_flag,type,ue->generic_stat_bis[ue->current_thread_id[nr_tti_rx]][slot].p_time/(cpuf*1000.0));
#endif #endif
#endif #endif
...@@ -404,9 +404,9 @@ int nr_rx_pdsch(PHY_VARS_NR_UE *ue, ...@@ -404,9 +404,9 @@ int nr_rx_pdsch(PHY_VARS_NR_UE *ue,
#if UE_TIMING_TRACE #if UE_TIMING_TRACE
stop_meas(&ue->generic_stat_bis[ue->current_thread_id[nr_tti_rx]][slot]); stop_meas(&ue->generic_stat_bis[ue->current_thread_id[nr_tti_rx]][slot]);
#if DISABLE_LOG_X #if DISABLE_LOG_X
printf("[AbsSFN %d.%d] Slot%d Symbol %d: Channel Scale %5.2f \n",frame,nr_tti_rx,slot,symbol,ue->generic_stat_bis[ue->current_thread_id[nr_tti_rx]][slot].p_time/(cpuf*1000.0)); printf("[AbsSFN %u.%d] Slot%d Symbol %d: Channel Scale %5.2f \n",frame,nr_tti_rx,slot,symbol,ue->generic_stat_bis[ue->current_thread_id[nr_tti_rx]][slot].p_time/(cpuf*1000.0));
#else #else
LOG_I(PHY, "[AbsSFN %d.%d] Slot%d Symbol %d: Channel Scale %5.2f \n",frame,nr_tti_rx,slot,symbol,ue->generic_stat_bis[ue->current_thread_id[nr_tti_rx]][slot].p_time/(cpuf*1000.0)); LOG_I(PHY, "[AbsSFN %u.%d] Slot%d Symbol %d: Channel Scale %5.2f \n",frame,nr_tti_rx,slot,symbol,ue->generic_stat_bis[ue->current_thread_id[nr_tti_rx]][slot].p_time/(cpuf*1000.0));
#endif #endif
#endif #endif
...@@ -483,9 +483,9 @@ int nr_rx_pdsch(PHY_VARS_NR_UE *ue, ...@@ -483,9 +483,9 @@ int nr_rx_pdsch(PHY_VARS_NR_UE *ue,
#if UE_TIMING_TRACE #if UE_TIMING_TRACE
stop_meas(&ue->generic_stat_bis[ue->current_thread_id[nr_tti_rx]][slot]); stop_meas(&ue->generic_stat_bis[ue->current_thread_id[nr_tti_rx]][slot]);
#if DISABLE_LOG_X #if DISABLE_LOG_X
printf("[AbsSFN %d.%d] Slot%d Symbol %d first_symbol_flag %d: Channel Level %5.2f \n",frame,nr_tti_rx,slot,symbol,first_symbol_flag,ue->generic_stat_bis[ue->current_thread_id[nr_tti_rx]][slot].p_time/(cpuf*1000.0)); printf("[AbsSFN %u.%d] Slot%d Symbol %d first_symbol_flag %d: Channel Level %5.2f \n",frame,nr_tti_rx,slot,symbol,first_symbol_flag,ue->generic_stat_bis[ue->current_thread_id[nr_tti_rx]][slot].p_time/(cpuf*1000.0));
#else #else
LOG_I(PHY, "[AbsSFN %d.%d] Slot%d Symbol %d first_symbol_flag %d: Channel Level %5.2f \n",frame,nr_tti_rx,slot,symbol,first_symbol_flag,ue->generic_stat_bis[ue->current_thread_id[nr_tti_rx]][slot].p_time/(cpuf*1000.0)); LOG_I(PHY, "[AbsSFN %u.%d] Slot%d Symbol %d first_symbol_flag %d: Channel Level %5.2f \n",frame,nr_tti_rx,slot,symbol,first_symbol_flag,ue->generic_stat_bis[ue->current_thread_id[nr_tti_rx]][slot].p_time/(cpuf*1000.0));
#endif #endif
#endif #endif
...@@ -596,9 +596,9 @@ int nr_rx_pdsch(PHY_VARS_NR_UE *ue, ...@@ -596,9 +596,9 @@ int nr_rx_pdsch(PHY_VARS_NR_UE *ue,
#if UE_TIMING_TRACE #if UE_TIMING_TRACE
stop_meas(&ue->generic_stat_bis[ue->current_thread_id[nr_tti_rx]][slot]); stop_meas(&ue->generic_stat_bis[ue->current_thread_id[nr_tti_rx]][slot]);
#if DISABLE_LOG_X #if DISABLE_LOG_X
printf("[AbsSFN %d.%d] Slot%d Symbol %d log2_maxh %d channel_level %d: Channel Comp %5.2f \n",frame,nr_tti_rx,slot,symbol,pdsch_vars[eNB_id]->log2_maxh,proc->channel_level,ue->generic_stat_bis[ue->current_thread_id[nr_tti_rx]][slot].p_time/(cpuf*1000.0)); printf("[AbsSFN %u.%d] Slot%d Symbol %d log2_maxh %d channel_level %d: Channel Comp %5.2f \n",frame,nr_tti_rx,slot,symbol,pdsch_vars[eNB_id]->log2_maxh,proc->channel_level,ue->generic_stat_bis[ue->current_thread_id[nr_tti_rx]][slot].p_time/(cpuf*1000.0));
#else #else
LOG_I(PHY, "[AbsSFN %d.%d] Slot%d Symbol %d log2_maxh %d channel_level %d: Channel Comp %5.2f \n",frame,nr_tti_rx,slot,symbol,pdsch_vars[eNB_id]->log2_maxh,proc->channel_level,ue->generic_stat_bis[ue->current_thread_id[nr_tti_rx]][slot].p_time/(cpuf*1000.0)); LOG_I(PHY, "[AbsSFN %u.%d] Slot%d Symbol %d log2_maxh %d channel_level %d: Channel Comp %5.2f \n",frame,nr_tti_rx,slot,symbol,pdsch_vars[eNB_id]->log2_maxh,proc->channel_level,ue->generic_stat_bis[ue->current_thread_id[nr_tti_rx]][slot].p_time/(cpuf*1000.0));
#endif #endif
#endif #endif
// MRC // MRC
...@@ -641,9 +641,9 @@ int nr_rx_pdsch(PHY_VARS_NR_UE *ue, ...@@ -641,9 +641,9 @@ int nr_rx_pdsch(PHY_VARS_NR_UE *ue,
#if UE_TIMING_TRACE #if UE_TIMING_TRACE
stop_meas(&ue->generic_stat_bis[ue->current_thread_id[nr_tti_rx]][slot]); stop_meas(&ue->generic_stat_bis[ue->current_thread_id[nr_tti_rx]][slot]);
#if DISABLE_LOG_X #if DISABLE_LOG_X
printf("[AbsSFN %d.%d] Slot%d Symbol %d: Channel Combine %5.2f \n",frame,nr_tti_rx,slot,symbol,ue->generic_stat_bis[ue->current_thread_id[nr_tti_rx]][slot].p_time/(cpuf*1000.0)); printf("[AbsSFN %u.%d] Slot%d Symbol %d: Channel Combine %5.2f \n",frame,nr_tti_rx,slot,symbol,ue->generic_stat_bis[ue->current_thread_id[nr_tti_rx]][slot].p_time/(cpuf*1000.0));
#else #else
LOG_I(PHY, "[AbsSFN %d.%d] Slot%d Symbol %d: Channel Combine %5.2f \n",frame,nr_tti_rx,slot,symbol,ue->generic_stat_bis[ue->current_thread_id[nr_tti_rx]][slot].p_time/(cpuf*1000.0)); LOG_I(PHY, "[AbsSFN %u.%d] Slot%d Symbol %d: Channel Combine %5.2f \n",frame,nr_tti_rx,slot,symbol,ue->generic_stat_bis[ue->current_thread_id[nr_tti_rx]][slot].p_time/(cpuf*1000.0));
#endif #endif
#endif #endif
...@@ -1018,9 +1018,9 @@ int nr_rx_pdsch(PHY_VARS_NR_UE *ue, ...@@ -1018,9 +1018,9 @@ int nr_rx_pdsch(PHY_VARS_NR_UE *ue,
#if UE_TIMING_TRACE #if UE_TIMING_TRACE
stop_meas(&ue->generic_stat_bis[ue->current_thread_id[nr_tti_rx]][slot]); stop_meas(&ue->generic_stat_bis[ue->current_thread_id[nr_tti_rx]][slot]);
#if DISABLE_LOG_X #if DISABLE_LOG_X
printf("[AbsSFN %d.%d] Slot%d Symbol %d: LLR Computation %5.2f \n",frame,nr_tti_rx,slot,symbol,ue->generic_stat_bis[ue->current_thread_id[nr_tti_rx]][slot].p_time/(cpuf*1000.0)); printf("[AbsSFN %u.%d] Slot%d Symbol %d: LLR Computation %5.2f \n",frame,nr_tti_rx,slot,symbol,ue->generic_stat_bis[ue->current_thread_id[nr_tti_rx]][slot].p_time/(cpuf*1000.0));
#else #else
LOG_I(PHY, "[AbsSFN %d.%d] Slot%d Symbol %d: LLR Computation %5.2f \n",frame,nr_tti_rx,slot,symbol,ue->generic_stat_bis[ue->current_thread_id[nr_tti_rx]][slot].p_time/(cpuf*1000.0)); LOG_I(PHY, "[AbsSFN %u.%d] Slot%d Symbol %d: LLR Computation %5.2f \n",frame,nr_tti_rx,slot,symbol,ue->generic_stat_bis[ue->current_thread_id[nr_tti_rx]][slot].p_time/(cpuf*1000.0));
#endif #endif
#endif #endif
// Please keep it: useful for debugging // Please keep it: useful for debugging
...@@ -1091,7 +1091,7 @@ void nr_dlsch_deinterleaving(uint8_t symbol, ...@@ -1091,7 +1091,7 @@ void nr_dlsch_deinterleaving(uint8_t symbol,
uint32_t *bundle_deint = malloc(N_bundle*sizeof(uint32_t)); uint32_t *bundle_deint = malloc(N_bundle*sizeof(uint32_t));
printf("N_bundle %d L %d nb_rb_pdsch %d\n",N_bundle, L,nb_rb_pdsch); printf("N_bundle %u L %d nb_rb_pdsch %d\n",N_bundle, L,nb_rb_pdsch);
if (symbol==start_symbol) if (symbol==start_symbol)
nb_re = 6; nb_re = 6;
...@@ -1117,6 +1117,7 @@ void nr_dlsch_deinterleaving(uint8_t symbol, ...@@ -1117,6 +1117,7 @@ void nr_dlsch_deinterleaving(uint8_t symbol,
//printf("k %d m %d bundle_deint %d llr_deint %d\n", k, m, bundle_deint[k], llr_deint[bundle_deint[k]*nb_re*L+m]); //printf("k %d m %d bundle_deint %d llr_deint %d\n", k, m, bundle_deint[k], llr_deint[bundle_deint[k]*nb_re*L+m]);
} }
} }
free(bundle_deint);
} }
//============================================================================================== //==============================================================================================
...@@ -2455,7 +2456,7 @@ unsigned short nr_dlsch_extract_rbs_dual(int **rxdataF, ...@@ -2455,7 +2456,7 @@ unsigned short nr_dlsch_extract_rbs_dual(int **rxdataF,
int prb,nb_rb=0; int prb,nb_rb=0;
unsigned short k; unsigned short k;
int i,j,aarx; int i,j,aarx;
int32_t *dl_ch0=NULL,*dl_ch0p=NULL,*dl_ch0_ext=NULL,*dl_ch1=NULL,*dl_ch1p=NULL,*dl_ch1_ext=NULL,*rxF=NULL,*rxF_ext=NULL; int32_t *dl_ch0=NULL,*dl_ch0_ext=NULL,*dl_ch1=NULL,*dl_ch1_ext=NULL,*rxF=NULL,*rxF_ext=NULL;
k = frame_parms->first_carrier_offset + 516; //0 k = frame_parms->first_carrier_offset + 516; //0
...@@ -2511,8 +2512,8 @@ unsigned short nr_dlsch_extract_rbs_dual(int **rxdataF, ...@@ -2511,8 +2512,8 @@ unsigned short nr_dlsch_extract_rbs_dual(int **rxdataF,
if ((i&1)!=frame_parms->nushift) { if ((i&1)!=frame_parms->nushift) {
rxF_ext[j]=rxF[i]; rxF_ext[j]=rxF[i];
// printf("extract rb %d, re %d => (%d,%d)\n",rb,i,*(short *)&rxF_ext[j],*(1+(short*)&rxF_ext[j])); // printf("extract rb %d, re %d => (%d,%d)\n",rb,i,*(short *)&rxF_ext[j],*(1+(short*)&rxF_ext[j]));
dl_ch0_ext[j]=dl_ch0p[i]; dl_ch0_ext[j]=dl_ch0[i];
dl_ch1_ext[j++]=dl_ch1p[i]; dl_ch1_ext[j++]=dl_ch1[i];
} }
} }
dl_ch0_ext+=6; dl_ch0_ext+=6;
......
openair2/ENB_APP/enb_config.c
View file @ aaaa6d5c
This diff is collapsed.
openair2/ENB_APP/enb_paramdef.h
View file @ aaaa6d5c
...@@ -539,122 +539,122 @@ typedef struct ccparams_lte_s { ...@@ -539,122 +539,122 @@ typedef struct ccparams_lte_s {
} ccparams_lte_t; } ccparams_lte_t;
#define CCPARAMS_CHECK { \ #define CCPARAMS_CHECK { \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s1a= { config_check_modify_integer, UETIMER_T300_OKVALUES, UETIMER_T300_MODVALUES,8}} ,\ { .s1a= { config_check_modify_integer, UETIMER_T300_OKVALUES, UETIMER_T300_MODVALUES,8}} ,\
{ .s1a= { config_check_modify_integer, UETIMER_T301_OKVALUES, UETIMER_T301_MODVALUES,8}} ,\ { .s1a= { config_check_modify_integer, UETIMER_T301_OKVALUES, UETIMER_T301_MODVALUES,8}} ,\
{ .s1a= { config_check_modify_integer, UETIMER_T310_OKVALUES, UETIMER_T310_MODVALUES,7}} ,\ { .s1a= { config_check_modify_integer, UETIMER_T310_OKVALUES, UETIMER_T310_MODVALUES,7}} ,\
{ .s1a= { config_check_modify_integer, UETIMER_T311_OKVALUES, UETIMER_T311_MODVALUES,7}} ,\ { .s1a= { config_check_modify_integer, UETIMER_T311_OKVALUES, UETIMER_T311_MODVALUES,7}} ,\
{ .s1a= { config_check_modify_integer, UETIMER_N310_OKVALUES, UETIMER_N310_MODVALUES,8}} ,\ { .s1a= { config_check_modify_integer, UETIMER_N310_OKVALUES, UETIMER_N310_MODVALUES,8}} ,\
{ .s1a= { config_check_modify_integer, UETIMER_N311_OKVALUES, UETIMER_N311_MODVALUES,8}} ,\ { .s1a= { config_check_modify_integer, UETIMER_N311_OKVALUES, UETIMER_N311_MODVALUES,8}} ,\
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } , \ { { NULL } } , \
{ .s5 = { NULL } } \ { { NULL } } \
} }
/*-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------*/ /*-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------*/
......
openair2/ENB_APP/enb_paramdef_emtc.h
View file @ aaaa6d5c
...@@ -258,93 +258,93 @@ typedef struct ccparams_eMTC_s { ...@@ -258,93 +258,93 @@ typedef struct ccparams_eMTC_s {
} }
#define EMTCPARAMS_CHECK { \ #define EMTCPARAMS_CHECK { \
{ .s5= {NULL }} , \ { {NULL}} , \
{ .s5= {NULL }} , \ { {NULL}} , \
{ .s5= {NULL }} , \ { {NULL}} , \
{ .s5= {NULL }} , \ { {NULL}} , \
{ .s5= {NULL }} , \ { {NULL}} , \
{ .s5= {NULL }} , \ { {NULL}} , \
{ .s5= {NULL }} , \ { {NULL}} , \
{ .s5= {NULL }} , \ { {NULL}} , \
{ .s5= {NULL }} , \ { {NULL}} , \
{ .s5= {NULL }} , \ { {NULL}} , \
{ .s5= {NULL }} , \ { {NULL}} , \
{ .s5= {NULL }} , \ { {NULL}} , \
{ .s5= {NULL }} , \ { {NULL}} , \
{ .s5= {NULL }} , \ { {NULL}} , \
{ .s5= {NULL }} , \ { {NULL}} , \
{ .s5= {NULL }} , \ { {NULL}} , \
{ .s5= {NULL }} , \ { {NULL}} , \
{ .s5= {NULL }} , \ { {NULL}} , \
{ .s5= {NULL }} , \ { {NULL}} , \
{ .s5= {NULL }} , \ { {NULL}} , \
{ .s5= {NULL }} , \ { {NULL}} , \
{ .s5= {NULL }} , \ { {NULL}} , \
{ .s5= {NULL }} , \ { {NULL}} , \
{ .s5= {NULL }} , \ { {NULL}} , \
{ .s5= {NULL }} , \ { {NULL}} , \
{ .s5= {NULL }} , \ { {NULL}} , \
{ .s5= {NULL }} , \ { {NULL}} , \
{ .s5= {NULL }} , \ { {NULL}} , \
{ .s5= {NULL }} , \ { {NULL}} , \
{ .s5= {NULL }} , \ { {NULL}} , \
{ .s5= {NULL }} , \ { {NULL}} , \
{ .s5= {NULL }} , \ { {NULL}} , \
{ .s5= {NULL }} , \ { {NULL}} , \
{ .s5= {NULL }} , \ { {NULL}} , \
{ .s5= {NULL }} , \ { {NULL}} , \
{ .s5= {NULL }} , \ { {NULL}} , \
{ .s5= {NULL }} , \ { {NULL}} , \
{ .s5= {NULL }} , \ { {NULL}} , \
{ .s5= {NULL }} , \ { {NULL}} , \
{ .s5= {NULL }} , \ { {NULL}} , \
{ .s5= {NULL }} , \ { {NULL}} , \
{ .s5= {NULL }} , \ { {NULL}} , \
{ .s5= {NULL }} , \ { {NULL}} , \
{ .s5= {NULL }} , \ { {NULL}} , \
{ .s5= {NULL }} , \ { {NULL}} , \
{ .s5= {NULL }} , \ { {NULL}} , \
{ .s5= {NULL }} , \ { {NULL}} , \
{ .s5= {NULL }} , \ { {NULL}} , \
{ .s5= {NULL }} , \ { {NULL}} , \
{ .s5= {NULL }} , \ { {NULL}} , \
{ .s5= {NULL }} , \ { {NULL}} , \
{ .s1a= { config_check_modify_integer, UETIMER_T300_OKVALUES, UETIMER_T300_MODVALUES,8}} , \ { .s1a= { config_check_modify_integer, UETIMER_T300_OKVALUES, UETIMER_T300_MODVALUES,8}} , \
{ .s1a= { config_check_modify_integer, UETIMER_T301_OKVALUES, UETIMER_T301_MODVALUES,8}} , \ { .s1a= { config_check_modify_integer, UETIMER_T301_OKVALUES, UETIMER_T301_MODVALUES,8}} , \
{ .s1a= { config_check_modify_integer, UETIMER_T310_OKVALUES, UETIMER_T310_MODVALUES,7}} , \ { .s1a= { config_check_modify_integer, UETIMER_T310_OKVALUES, UETIMER_T310_MODVALUES,7}} , \
{ .s1a= { config_check_modify_integer, UETIMER_T311_OKVALUES, UETIMER_T311_MODVALUES,7}} , \ { .s1a= { config_check_modify_integer, UETIMER_T311_OKVALUES, UETIMER_T311_MODVALUES,7}} , \
{ .s1a= { config_check_modify_integer, UETIMER_N310_OKVALUES, UETIMER_N310_MODVALUES,8}} , \ { .s1a= { config_check_modify_integer, UETIMER_N310_OKVALUES, UETIMER_N310_MODVALUES,8}} , \
{ .s1a= { config_check_modify_integer, UETIMER_N311_OKVALUES, UETIMER_N311_MODVALUES,8}} , \ { .s1a= { config_check_modify_integer, UETIMER_N311_OKVALUES, UETIMER_N311_MODVALUES,8}} , \
{ .s5= {NULL }} , \ { {NULL}} , \
{ .s5= {NULL }} , \ { {NULL}} , \
{ .s5= {NULL }} , \ { {NULL}} , \
{ .s5= {NULL }} , \ { {NULL}} , \
{ .s5= {NULL }} , \ { {NULL}} , \
{ .s5= {NULL }} , \ { {NULL}} , \
{ .s5= {NULL }} , \ { {NULL}} , \
{ .s5= {NULL }} , \ { {NULL}} , \
{ .s5= {NULL }} , \ { {NULL}} , \
{ .s5= {NULL }} , \ { {NULL}} , \
{ .s5= {NULL }} , \ { {NULL}} , \
{ .s5= {NULL }} , \ { {NULL}} , \
{ .s5= {NULL }} , \ { {NULL}} , \
{ .s5= {NULL }} , \ { {NULL}} , \
{ .s5= {NULL }} , \ { {NULL}} , \
{ .s5= {NULL }} , \ { {NULL}} , \
{ .s5= {NULL }} , \ { {NULL}} , \
{ .s5= {NULL }} , \ { {NULL}} , \
{ .s5= {NULL }} , \ { {NULL}} , \
{ .s5= {NULL }} , \ { {NULL}} , \
{ .s5= {NULL }} , \ { {NULL}} , \
{ .s5= {NULL }} , \ { {NULL}} , \
{ .s5= {NULL }} , \ { {NULL}} , \
{ .s5= {NULL }} , \ { {NULL}} , \
{ .s5= {NULL }} , \ { {NULL}} , \
{ .s5= {NULL }} , \ { {NULL}} , \
{ .s5= {NULL }} , \ { {NULL}} , \
{ .s5= {NULL }} , \ { {NULL}} , \
{ .s5= {NULL }} , \ { {NULL}} , \
{ .s5= {NULL }} , \ { {NULL}} , \
} }
#define SYSTEM_INFO_VALUE_TAG_SI_DESC(eMTCconfig) { \ #define SYSTEM_INFO_VALUE_TAG_SI_DESC(eMTCconfig) { \
......
openair2/NETWORK_DRIVER/UE_IP/common.c
View file @ aaaa6d5c
...@@ -318,7 +318,7 @@ ue_ip_common_ip2wireless( ...@@ -318,7 +318,7 @@ ue_ip_common_ip2wireless(
if (bytes_wrote != UE_IP_PDCPH_SIZE) { if (bytes_wrote != UE_IP_PDCPH_SIZE) {
printk("[UE_IP_DRV][%s] problem while writing PDCP's header (bytes wrote = %d)\n",__FUNCTION__,bytes_wrote); printk("[UE_IP_DRV][%s] problem while writing PDCP's header (bytes wrote = %d)\n",__FUNCTION__,bytes_wrote);
printk("rb_id %d, Wrote %d, Header Size %d \n", pdcph.rb_id, bytes_wrote, UE_IP_PDCPH_SIZE); printk("rb_id %ld, Wrote %d, Header Size %d \n", pdcph.rb_id, bytes_wrote, UE_IP_PDCPH_SIZE);
priv_p->stats.tx_dropped ++; priv_p->stats.tx_dropped ++;
return; return;
} }
......
openair2/RRC/LTE/MESSAGES/asn1_msg.c
View file @ aaaa6d5c
...@@ -187,9 +187,8 @@ uint8_t do_MIB_FeMBMS(rrc_eNB_carrier_data_t *carrier, uint32_t N_RB_DL, uint32_ ...@@ -187,9 +187,8 @@ uint8_t do_MIB_FeMBMS(rrc_eNB_carrier_data_t *carrier, uint32_t N_RB_DL, uint32_
LTE_BCCH_BCH_Message_MBMS_t *mib_fembms=&carrier->mib_fembms; LTE_BCCH_BCH_Message_MBMS_t *mib_fembms=&carrier->mib_fembms;
uint8_t sfn = (uint8_t)((frame>>2)&0xff); uint8_t sfn = (uint8_t)((frame>>2)&0xff);
uint16_t *spare = calloc(1,sizeof(uint16_t)); uint16_t *spare = calloc(1,sizeof(uint16_t));
uint16_t *additionalNonMBSFNSubframes = calloc(1,sizeof(uint16_t));
if( spare == NULL || additionalNonMBSFNSubframes == NULL ) abort(); if( spare == NULL ) abort();
switch (N_RB_DL) { switch (N_RB_DL) {
case 6: case 6:
...@@ -217,7 +216,7 @@ uint8_t do_MIB_FeMBMS(rrc_eNB_carrier_data_t *carrier, uint32_t N_RB_DL, uint32_ ...@@ -217,7 +216,7 @@ uint8_t do_MIB_FeMBMS(rrc_eNB_carrier_data_t *carrier, uint32_t N_RB_DL, uint32_
break; break;
default: default:
AssertFatal(1==0,"Unknown dl_Bandwidth %d\n",N_RB_DL); AssertFatal(1==0,"Unknown dl_Bandwidth %u\n",N_RB_DL);
} }
LOG_I(RRC,"[MIB] systemBandwidth %x, additional non MBMS subframes %x, sfn %x\n", LOG_I(RRC,"[MIB] systemBandwidth %x, additional non MBMS subframes %x, sfn %x\n",
...@@ -287,7 +286,7 @@ uint8_t do_MIB(rrc_eNB_carrier_data_t *carrier, uint32_t N_RB_DL, uint32_t phich ...@@ -287,7 +286,7 @@ uint8_t do_MIB(rrc_eNB_carrier_data_t *carrier, uint32_t N_RB_DL, uint32_t phich
break; break;
default: default:
AssertFatal(1==0,"Unknown dl_Bandwidth %d\n",N_RB_DL); AssertFatal(1==0,"Unknown dl_Bandwidth %u\n",N_RB_DL);
} }
AssertFatal(phich_Resource <= LTE_PHICH_Config__phich_Resource_two,"Illegal phich_Resource\n"); AssertFatal(phich_Resource <= LTE_PHICH_Config__phich_Resource_two,"Illegal phich_Resource\n");
...@@ -1021,7 +1020,7 @@ uint8_t do_SIB1(rrc_eNB_carrier_data_t *carrier, ...@@ -1021,7 +1020,7 @@ uint8_t do_SIB1(rrc_eNB_carrier_data_t *carrier,
sib1_1310->bandwidthReducedAccessRelatedInfo_r13->fdd_DownlinkOrTddSubframeBitmapBR_r13 sib1_1310->bandwidthReducedAccessRelatedInfo_r13->fdd_DownlinkOrTddSubframeBitmapBR_r13
= calloc(1, sizeof(struct LTE_SystemInformationBlockType1_v1310_IEs__bandwidthReducedAccessRelatedInfo_r13__fdd_DownlinkOrTddSubframeBitmapBR_r13)); = calloc(1, sizeof(struct LTE_SystemInformationBlockType1_v1310_IEs__bandwidthReducedAccessRelatedInfo_r13__fdd_DownlinkOrTddSubframeBitmapBR_r13));
memset(sib1_1310->bandwidthReducedAccessRelatedInfo_r13->fdd_DownlinkOrTddSubframeBitmapBR_r13, 0, memset(sib1_1310->bandwidthReducedAccessRelatedInfo_r13->fdd_DownlinkOrTddSubframeBitmapBR_r13, 0,
sizeof(sizeof(struct LTE_SystemInformationBlockType1_v1310_IEs__bandwidthReducedAccessRelatedInfo_r13__fdd_DownlinkOrTddSubframeBitmapBR_r13))); sizeof(struct LTE_SystemInformationBlockType1_v1310_IEs__bandwidthReducedAccessRelatedInfo_r13__fdd_DownlinkOrTddSubframeBitmapBR_r13));
if (*configuration->fdd_DownlinkOrTddSubframeBitmapBR_r13[CC_id]) { if (*configuration->fdd_DownlinkOrTddSubframeBitmapBR_r13[CC_id]) {
sib1_1310->bandwidthReducedAccessRelatedInfo_r13->fdd_DownlinkOrTddSubframeBitmapBR_r13->present sib1_1310->bandwidthReducedAccessRelatedInfo_r13->fdd_DownlinkOrTddSubframeBitmapBR_r13->present
...@@ -1183,7 +1182,7 @@ uint8_t do_SIB1(rrc_eNB_carrier_data_t *carrier, ...@@ -1183,7 +1182,7 @@ uint8_t do_SIB1(rrc_eNB_carrier_data_t *carrier,
sib1_1310->bandwidthReducedAccessRelatedInfo_r13->fdd_DownlinkOrTddSubframeBitmapBR_r13 sib1_1310->bandwidthReducedAccessRelatedInfo_r13->fdd_DownlinkOrTddSubframeBitmapBR_r13
= calloc(1, sizeof(struct LTE_SystemInformationBlockType1_v1310_IEs__bandwidthReducedAccessRelatedInfo_r13__fdd_DownlinkOrTddSubframeBitmapBR_r13)); = calloc(1, sizeof(struct LTE_SystemInformationBlockType1_v1310_IEs__bandwidthReducedAccessRelatedInfo_r13__fdd_DownlinkOrTddSubframeBitmapBR_r13));
memset(sib1_1310->bandwidthReducedAccessRelatedInfo_r13->fdd_DownlinkOrTddSubframeBitmapBR_r13, 0, memset(sib1_1310->bandwidthReducedAccessRelatedInfo_r13->fdd_DownlinkOrTddSubframeBitmapBR_r13, 0,
sizeof(sizeof(struct LTE_SystemInformationBlockType1_v1310_IEs__bandwidthReducedAccessRelatedInfo_r13__fdd_DownlinkOrTddSubframeBitmapBR_r13))); sizeof(struct LTE_SystemInformationBlockType1_v1310_IEs__bandwidthReducedAccessRelatedInfo_r13__fdd_DownlinkOrTddSubframeBitmapBR_r13));
sib1_1310->bandwidthReducedAccessRelatedInfo_r13->fdd_DownlinkOrTddSubframeBitmapBR_r13->present sib1_1310->bandwidthReducedAccessRelatedInfo_r13->fdd_DownlinkOrTddSubframeBitmapBR_r13->present
= LTE_SystemInformationBlockType1_v1310_IEs__bandwidthReducedAccessRelatedInfo_r13__fdd_DownlinkOrTddSubframeBitmapBR_r13_PR_subframePattern10_r13; = LTE_SystemInformationBlockType1_v1310_IEs__bandwidthReducedAccessRelatedInfo_r13__fdd_DownlinkOrTddSubframeBitmapBR_r13_PR_subframePattern10_r13;
sib1_1310->bandwidthReducedAccessRelatedInfo_r13->fdd_DownlinkOrTddSubframeBitmapBR_r13->choice.subframePattern10_r13.buf = calloc(2, sizeof(uint8_t)); sib1_1310->bandwidthReducedAccessRelatedInfo_r13->fdd_DownlinkOrTddSubframeBitmapBR_r13->choice.subframePattern10_r13.buf = calloc(2, sizeof(uint8_t));
......
targets/RT/USER/lte-hwlat2.c
View file @ aaaa6d5c
...@@ -1197,7 +1197,7 @@ void histogram_save_in_csv( histo_time_t *histo , char *file_sufix) ...@@ -1197,7 +1197,7 @@ void histogram_save_in_csv( histo_time_t *histo , char *file_sufix)
fprintf( fp, "%d-%.0f;%u\n", min_val, histo[i].max, histo[i].count ); fprintf( fp, "%d-%.0f;%u\n", min_val, histo[i].max, histo[i].count );
min_val = histo[i].max; min_val = histo[i].max;
} }
free(csv_filename);
fclose( fp ); fclose( fp );
} }
......
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