Skip to content

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

bug fix

parent d04d2879
Hide whitespace changes
Inline Side-by-side
Showing with 36 additions and 36 deletions
openair1/SCHED/phy_procedures_lte_eNb.c
View file @ 888067c3
...@@ -808,17 +808,15 @@ proc->flag_scrambling =0; ...@@ -808,17 +808,15 @@ proc->flag_scrambling =0;
} }
} }
} }
} }
}
/* NB_IoT_eNB_NPDCCH_temp_t *npdcch_struct = &eNB->npdcch_tmp;
NB_IoT_eNB_NPDCCH_temp_t *npdcch_struct = &eNB->npdcch_tmp;
if(subframe==2) if(subframe==2)
{ {
printf("\n DCI 2 sentttttt frame %d, subframe %d", frame, subframe); printf("\n DCI 2 sentttttt frame %d, subframe %d", frame, subframe);
...@@ -895,8 +893,8 @@ proc->flag_scrambling =0; ...@@ -895,8 +893,8 @@ proc->flag_scrambling =0;
proc->next_subframe_tx=2; proc->next_subframe_tx=2;
} }
} } */
} // }
if(subframe !=5 && subframe !=0) if(subframe !=5 && subframe !=0)
{ {
...@@ -911,7 +909,7 @@ if(subframe !=5 && subframe !=0) ...@@ -911,7 +909,7 @@ if(subframe !=5 && subframe !=0)
tab_rar[3]=67; tab_rar[3]=67;
tab_rar[4]=64; tab_rar[4]=64;
tab_rar[5]=0; // 16 tab_rar[5]=0; // 16
tab_rar[6]=5; // 5*/ tab_rar[6]=1; // 5*/
//T-CRNTI =4101 //T-CRNTI =4101
/* if(proc->remaining_rar == 4) /* if(proc->remaining_rar == 4)
{ {
...@@ -984,32 +982,33 @@ if(subframe !=5 && subframe !=0) ...@@ -984,32 +982,33 @@ if(subframe !=5 && subframe !=0)
} }
} else { } else {
if( ((frame)%2==0) && (subframe ==9)) if( ((frame)%2==0) && (subframe ==9))
{ {
proc->next_subframe_tx =1; proc->next_subframe_tx =1;
proc->next_frame_tx = proc->next_frame_tx+1; proc->next_frame_tx = proc->next_frame_tx+1;
} else { } else {
if(proc->flag_scrambling ==0)
{ if(proc->flag_scrambling ==0)
{
dlsch_encoding_rar_NB_IoT(tab_rar,
rar, dlsch_encoding_rar_NB_IoT(tab_rar,
8, ///// number_of_subframes_required rar,
236, 8, ///// number_of_subframes_required
1); //////////// G*2 236,
1); //////////// G*2
dlsch_sib_scrambling_rar_NB_IoT(fp, dlsch_sib_scrambling_rar_NB_IoT(fp,
rar, rar,
236, 236,
frame, frame,
subframe*2, subframe*2,
RA_template[0].RA_rnti); RA_template[0].RA_rnti);
} }
proc->flag_scrambling =1; proc->flag_scrambling =1;
printf("\n RAR sentttttt frame %d, subframe %d", frame, subframe); printf("\n RAR sentttttt frame %d, subframe %d", frame, subframe);
dlsch_modulation_rar_NB_IoT(txdataF, dlsch_modulation_rar_NB_IoT(txdataF,
AMP, AMP,
fp, fp,
3, // control region size for LTE , values between 0..3, (0 for stand-alone / 1, 2 or 3 for in-band) 3, // control region size for LTE , values between 0..3, (0 for stand-alone / 1, 2 or 3 for in-band)
...@@ -1019,9 +1018,9 @@ if(subframe !=5 && subframe !=0) ...@@ -1019,9 +1018,9 @@ if(subframe !=5 && subframe !=0)
subframe, subframe,
22); 22);
proc->remaining_rar--; proc->remaining_rar--;
proc->next_subframe_tx =subframe+1; proc->next_subframe_tx =subframe+1;
} }
} }
...@@ -1029,8 +1028,9 @@ if(subframe !=5 && subframe !=0) ...@@ -1029,8 +1028,9 @@ if(subframe !=5 && subframe !=0)
} }
}
} }
}
/////////////////////////// END /////////////////////////////////////// /////////////////////////// END ///////////////////////////////////////
......
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