Skip to content

O
OpenXG-RAN
Commit be6e0e03 authored by Matthieu Kanj's avatar Matthieu Kanj
Browse files
Options

segmentation fault fix for UL indication

parent ddbcbac9
Show whitespace changes
Inline Side-by-side
Showing with 14 additions and 11 deletions
openair1/SCHED/phy_procedures_lte_eNb.c
View file @ be6e0e03
...@@ -2280,15 +2280,9 @@ void prach_procedures_NB_IoT(PHY_VARS_eNB *eNB) { ...@@ -2280,15 +2280,9 @@ void prach_procedures_NB_IoT(PHY_VARS_eNB *eNB) {
detection = rx_nprach_NB_IoT(eNB,frame,subframe,rnti,preamble_index,timing_advance_preamble); detection = rx_nprach_NB_IoT(eNB,frame,subframe,rnti,preamble_index,timing_advance_preamble);
} }
/*if(detection == 1) ////////////////////////// to be moved to handle_rach_NB_IoT if(detection == 1) ////////////////////////// to be moved to handle_rach_NB_IoT
{ {
** initiate_ra_proc(UL_info->module_id,
UL_info->CC_id,
NFAPI_SFNSF2SFN(UL_info->rach_ind.sfn_sf),
NFAPI_SFNSF2SF(UL_info->rach_ind.sfn_sf),
UL_info->rach_ind.rach_indication_body.preamble_list[0].preamble_rel8.preamble,
UL_info->rach_ind.rach_indication_body.preamble_list[0].preamble_rel8.timing_advance,
UL_info->rach_ind.rach_indication_body.preamble_list[0].preamble_rel8.rnti); **
pthread_mutex_lock(&eNB->UL_INFO_mutex); pthread_mutex_lock(&eNB->UL_INFO_mutex);
////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////
...@@ -2300,10 +2294,17 @@ void prach_procedures_NB_IoT(PHY_VARS_eNB *eNB) { ...@@ -2300,10 +2294,17 @@ void prach_procedures_NB_IoT(PHY_VARS_eNB *eNB) {
eNB->UL_INFO.frame = frame; eNB->UL_INFO.frame = frame;
eNB->UL_INFO.subframe = subframe; eNB->UL_INFO.subframe = subframe;
//eNB->UL_INFO.hypersfn = ; eNB->UL_INFO.hypersfn = eNB->proc.proc_rxtx[0].HFN;
pthread_mutex_unlock(&eNB->UL_INFO_mutex); pthread_mutex_unlock(&eNB->UL_INFO_mutex);
/*initiate_ra_proc(UL_info->module_id,
UL_info->CC_id,
NFAPI_SFNSF2SFN(UL_info->rach_ind.sfn_sf),
NFAPI_SFNSF2SF(UL_info->rach_ind.sfn_sf),
UL_info->rach_ind.rach_indication_body.preamble_list[0].preamble_rel8.preamble,
UL_info->rach_ind.rach_indication_body.preamble_list[0].preamble_rel8.timing_advance,
UL_info->rach_ind.rach_indication_body.preamble_list[0].preamble_rel8.rnti); */
mac_xface->initiate_ra_proc(eNB->Mod_id, mac_xface->initiate_ra_proc(eNB->Mod_id,
eNB->CC_id, eNB->CC_id,
...@@ -2311,7 +2312,7 @@ void prach_procedures_NB_IoT(PHY_VARS_eNB *eNB) { ...@@ -2311,7 +2312,7 @@ void prach_procedures_NB_IoT(PHY_VARS_eNB *eNB) {
preamble_index[0], preamble_index[0],
(int16_t) timing_advance_preamble[0], (int16_t) timing_advance_preamble[0],
0,subframe,0); 0,subframe,0);
}*/ }
} }
//////////////////////////////////////////////////////////// END /////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////// END ///////////////////////////////////////////////////////////
......
targets/SIMU/USER/init_lte.c
View file @ be6e0e03
...@@ -147,6 +147,8 @@ PHY_VARS_eNB* init_lte_eNB(LTE_DL_FRAME_PARMS *frame_parms, ...@@ -147,6 +147,8 @@ PHY_VARS_eNB* init_lte_eNB(LTE_DL_FRAME_PARMS *frame_parms,
PHY_vars_eNB->ndlsch_SIB23 = new_eNB_dlsch_NB_IoT(1,frame_parms); PHY_vars_eNB->ndlsch_SIB23 = new_eNB_dlsch_NB_IoT(1,frame_parms);
PHY_vars_eNB->ndlsch_RAR = new_eNB_dlsch_NB_IoT(1,frame_parms); PHY_vars_eNB->ndlsch_RAR = new_eNB_dlsch_NB_IoT(1,frame_parms);
PHY_vars_eNB->UL_INFO.nrach_ind.nrach_pdu_list = (nfapi_nrach_indication_pdu_t *)malloc16(sizeof(nfapi_nrach_indication_pdu_t));
PHY_vars_eNB->ndlsch_SIB1->rnti = 0xffff; PHY_vars_eNB->ndlsch_SIB1->rnti = 0xffff;
PHY_vars_eNB->ndlsch_SIB23->rnti = 0xffff; PHY_vars_eNB->ndlsch_SIB23->rnti = 0xffff;
......
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