Commit a06aad7f authored by oai's avatar oai

fix a segmentation error,but still have one...sol:fill NB-IoT parameters tnto...

fix a segmentation error,but still have one...sol:fill NB-IoT parameters tnto eNB_NB_IoT Struct from eNB struct
parent b159cd37
...@@ -1355,13 +1355,11 @@ void prach_procedures_NB_IoT(PHY_VARS_eNB_NB_IoT *eNB) { ...@@ -1355,13 +1355,11 @@ void prach_procedures_NB_IoT(PHY_VARS_eNB_NB_IoT *eNB) {
uint16_t rnti[4],preamble_index[4],timing_advance_preamble[4]; uint16_t rnti[4],preamble_index[4],timing_advance_preamble[4];
// uint16_t i; // uint16_t i;
// int frame,subframe; // int frame,subframe;
uint8_t subframe = eNB->proc.subframe_prach; uint8_t subframe = eNB->proc.subframe_prach;
int frame = eNB->proc.frame_prach; int frame = eNB->proc.frame_prach;
// uint8_t CC_id = eNB->CC_id; // uint8_t CC_id = eNB->CC_id;
uint32_t detection=0; uint32_t detection=0;
//uint16_t estimated_TA=2; //uint16_t estimated_TA=2;
if (eNB->abstraction_flag == 0) { if (eNB->abstraction_flag == 0) {
/* rx_prach(eNB, /* rx_prach(eNB,
preamble_energy_list, preamble_energy_list,
......
...@@ -159,6 +159,7 @@ extern void add_subframe(uint16_t *frameP, uint16_t *subframeP, int offset); ...@@ -159,6 +159,7 @@ extern void add_subframe(uint16_t *frameP, uint16_t *subframeP, int offset);
//#define TICK_TO_US(ts) (ts.diff) //#define TICK_TO_US(ts) (ts.diff)
#define TICK_TO_US(ts) (ts.trials==0?0:ts.diff/ts.trials) #define TICK_TO_US(ts) (ts.trials==0?0:ts.diff/ts.trials)
eNBs_t eNBs;//Ann and samuel
static inline int rxtx(PHY_VARS_eNB *eNB,L1_rxtx_proc_t *proc, char *thread_name) { static inline int rxtx(PHY_VARS_eNB *eNB,L1_rxtx_proc_t *proc, char *thread_name) {
int ret; int ret;
...@@ -772,7 +773,6 @@ static void *eNB_thread_prach( void *param ){ ...@@ -772,7 +773,6 @@ static void *eNB_thread_prach( void *param ){
,0 ,0
#endif #endif
); );
prach_procedures_NB_IoT(eNB_NB_IoT);//Ann prach_procedures_NB_IoT(eNB_NB_IoT);//Ann
if (release_thread(&proc->mutex_prach,&proc->instance_cnt_prach,"eNB_prach_thread") < 0) break; if (release_thread(&proc->mutex_prach,&proc->instance_cnt_prach,"eNB_prach_thread") < 0) break;
...@@ -858,7 +858,6 @@ static void *process_stats_thread(void *param) { ...@@ -858,7 +858,6 @@ static void *process_stats_thread(void *param) {
void init_eNB_proc(int inst) { void init_eNB_proc(int inst) {
/*int i=0;*/ /*int i=0;*/
int CC_id; int CC_id;
eNBs_t eNBs;//Ann
L1_proc_t *proc; L1_proc_t *proc;
L1_rxtx_proc_t *L1_proc, *L1_proc_tx; L1_rxtx_proc_t *L1_proc, *L1_proc_tx;
pthread_attr_t *attr0=NULL,*attr1=NULL,*attr_prach=NULL; pthread_attr_t *attr0=NULL,*attr1=NULL,*attr_prach=NULL;
......
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