5g-team
/
srsRAN_4G
mirror of https://github.com/pvnis/srsRAN_4G.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix merge compilation error

Browse Source
master
ismagom 9 years ago
parent c0cf783fbd
commit aed414ad9a
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File

18
srsapps/ue/mac/src/mac.cc
Unescape Escape View File

@ -710,19 +710,19 @@ void mac::tti_thread::run_tti(uint32_t tti) {
pthread_mutex_unlock(&parent->tti_threads_sync_tx[(tti+1)%parent->NOF_TTI_THREADS]); pthread_mutex_unlock(&parent->tti_threads_sync_tx[(tti+1)%parent->NOF_TTI_THREADS]);
// Check if there is pending CCCH SDU in Multiplexing Unit // Check if there is pending CCCH SDU in Multiplexing Unit
if (mux_unit.is_pending_ccch_sdu()) { if (parent->mux_unit.is_pending_ccch_sdu()) {
// Start RA procedure // Start RA procedure
if (!ra_procedure.in_progress() && !ra_procedure.is_successful()) { if (!parent->ra_procedure.in_progress() && !parent->ra_procedure.is_successful()) {
ra_procedure.start_rlc_order(); parent->ra_procedure.start_rlc_order();
} }
} }
if (ra_procedure.is_successful() && if (parent->ra_procedure.is_successful() &&
phy_rnti != params_db.get_param(mac_params::RNTI_C) && parent->phy_rnti != parent->params_db.get_param(mac_params::RNTI_C) &&
params_db.get_param(mac_params::RNTI_C) > 0 && parent->params_db.get_param(mac_params::RNTI_C) > 0 &&
phy_h->get_param(srslte::ue::phy_params::SRS_IS_CONFIGURED) == 1) parent->phy_h->get_param(srslte::ue::phy_params::SRS_IS_CONFIGURED) == 1)
{ {
phy_rnti = params_db.get_param(mac_params::RNTI_C); parent->phy_rnti = parent->params_db.get_param(mac_params::RNTI_C);
pregen_phy(phy_rnti); parent->pregen_phy(parent->phy_rnti);
} }
} }
} }

Write Preview
Loading…
Cancel
Save