Skip to content

O
OpenXG-RAN
Commit f32297fe authored by Thomas Schlichter's avatar Thomas Schlichter
Browse files
Options

fix cppcheck warnings

parent 729adbcd
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 7 deletions
openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
View file @ f32297fe
...@@ -80,12 +80,19 @@ void init_RA(module_id_t mod_id, ...@@ -80,12 +80,19 @@ void init_RA(module_id_t mod_id,
LOG_I(MAC, "Initialization of 4-step contention-free random access procedure\n"); LOG_I(MAC, "Initialization of 4-step contention-free random access procedure\n");
prach_resources->RA_TYPE = RA_4STEP; prach_resources->RA_TYPE = RA_4STEP;
ra->cfra = 1; ra->cfra = 1;
} else if (rach_ConfigDedicated->ext1){
if (rach_ConfigDedicated->ext1->cfra_TwoStep_r16){
LOG_I(MAC, "In %s: setting RA type to 2-step...\n", __FUNCTION__);
prach_resources->RA_TYPE = RA_2STEP;
ra->cfra = 1;
} else {
LOG_E(MAC, "In %s: config not handled\n", __FUNCTION__);
}
} else {
LOG_E(MAC, "In %s: config not handled\n", __FUNCTION__);
} }
} else if (rach_ConfigDedicated->ext1){ } else {
if (rach_ConfigDedicated->ext1->cfra_TwoStep_r16){ LOG_E(MAC, "In %s: config not handled\n", __FUNCTION__);
LOG_I(MAC, "In %s: setting RA type to 2-step...\n", __FUNCTION__);
prach_resources->RA_TYPE = RA_2STEP;
}
} }
if (prach_resources->RA_TYPE == RA_2STEP){ if (prach_resources->RA_TYPE == RA_2STEP){
......
targets/RT/USER/lte-ue.c
View file @ f32297fe
...@@ -787,10 +787,10 @@ static void *UE_thread_rxn_txnp4(void *arg) ...@@ -787,10 +787,10 @@ static void *UE_thread_rxn_txnp4(void *arg)
if ( (proc->sub_frame_start+1)%RX_NB_TH == 0 && threads.one != -1 ) if ( (proc->sub_frame_start+1)%RX_NB_TH == 0 && threads.one != -1 )
CPU_SET(threads.one, &cpuset); CPU_SET(threads.one, &cpuset);
if ( (proc->sub_frame_start+1)%RX_NB_TH == 1 && threads.two != -1 ) if ( RX_NB_TH > 1 && (proc->sub_frame_start+1)%RX_NB_TH == 1 && threads.two != -1 )
CPU_SET(threads.two, &cpuset); CPU_SET(threads.two, &cpuset);
if ( (proc->sub_frame_start+1)%RX_NB_TH == 2 && threads.three != -1 ) if ( RX_NB_TH > 2 && (proc->sub_frame_start+1)%RX_NB_TH == 2 && threads.three != -1 )
CPU_SET(threads.three, &cpuset); CPU_SET(threads.three, &cpuset);
//CPU_SET(threads.three, &cpuset); //CPU_SET(threads.three, &cpuset);
......
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