maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug fix in MAC preprocessor contributed by INNOV

Browse Source 
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@7540 818b1a75-f10b-46b9-bf7c-635c3b92a50f
This commit is contained in:
Navid Nikaein
2015-06-05 15:20:17 +00:00
parent 4b95052518
commit 41311fa942
2 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/LAYER2/MAC/pre_processor.c
+17 -20
View File
@@ -312,19 +312,18 @@ void sort_UEs (module_id_t Mod_idP,
for(ii=UE_list->next[i]; ii>=0; ii=UE_list->next[ii]) { for(ii=UE_list->next[i]; ii>=0; ii=UE_list->next[ii]) {
rnti1 = UE_RNTI(Mod_idP,i); UE_id1 = i;
rnti1 = UE_RNTI(Mod_idP,UE_id1);
if(rnti1 == NOT_A_RNTI) if(rnti1 == NOT_A_RNTI)
continue; continue;
UE_id1 = i;
pCC_id1 = UE_PCCID(Mod_idP,UE_id1); pCC_id1 = UE_PCCID(Mod_idP,UE_id1);
cqi1 = maxcqi(Mod_idP,UE_id1); // cqi1 = maxcqi(Mod_idP,UE_id1); //
round1 = maxround(Mod_idP,rnti1,frameP,subframeP,0); round1 = maxround(Mod_idP,rnti1,frameP,subframeP,0);
if(rnti2 == NOT_A_RNTI)
continue;
UE_id2 = ii; UE_id2 = ii;
rnti2 = UE_RNTI(Mod_idP,UE_id2); rnti2 = UE_RNTI(Mod_idP,UE_id2);
if(rnti2 == NOT_A_RNTI)
continue;
cqi2 = maxcqi(Mod_idP,UE_id2); cqi2 = maxcqi(Mod_idP,UE_id2);
round2 = maxround(Mod_idP,rnti2,frameP,subframeP,0); //mac_xface->get_ue_active_harq_pid(Mod_id,rnti2,subframe,&harq_pid2,&round2,0); round2 = maxround(Mod_idP,rnti2,frameP,subframeP,0); //mac_xface->get_ue_active_harq_pid(Mod_id,rnti2,subframe,&harq_pid2,&round2,0);
pCC_id2 = UE_PCCID(Mod_idP,UE_id2); pCC_id2 = UE_PCCID(Mod_idP,UE_id2);
@@ -1126,26 +1125,24 @@ void sort_ue_ul (module_id_t module_idP,int frameP, sub_frame_t subframeP)
for (i=UE_list->head_ul; i>=0; i=UE_list->next_ul[i]) { for (i=UE_list->head_ul; i>=0; i=UE_list->next_ul[i]) {
//LOG_I(MAC,"sort ue ul i %d\n",i); //LOG_I(MAC,"sort ue ul i %d\n",i);
for (ii=UE_list->next_ul[i]; ii>=0; ii=UE_list->next_ul[ii]) {
rnti1 = UE_RNTI(module_idP,i); //LOG_I(MAC,"sort ul ue 2 ii %d\n",ii);
if(rnti1 == NOT_A_RNTI) UE_id1 = i;
rnti1 = UE_RNTI(module_idP,UE_id1);
if(rnti1 == NOT_A_RNTI)
continue; continue;
UE_id1 = i; pCCid1 = UE_PCCID(module_idP,UE_id1);
pCCid1 = UE_PCCID(module_idP,UE_id1); round1 = maxround(module_idP,rnti1,frameP,subframeP,1);
round1 = maxround(module_idP,rnti1,frameP,subframeP,1);
UE_id2 = ii;
for (ii=UE_list->next_ul[i]; ii>=0; ii=UE_list->next_ul[ii]) { rnti2 = UE_RNTI(module_idP,UE_id2);
//LOG_I(MAC,"sort ul ue 2 ii %d\n",ii);
rnti2 = UE_RNTI(module_idP,ii);
if(rnti2 == NOT_A_RNTI) if(rnti2 == NOT_A_RNTI)
continue; continue;
UE_id2 = ii;
pCCid2 = UE_PCCID(module_idP,UE_id2); pCCid2 = UE_PCCID(module_idP,UE_id2);
round2 = maxround(module_idP,rnti2,frameP,subframeP,1); round2 = maxround(module_idP,rnti2,frameP,subframeP,1);
openair2/UTIL/OTG/otg_tx.c
+5 -3
View File
@@ -1827,12 +1827,14 @@ void init_predef_traffic(
#endif #endif
break; break;
default: case FULL_BUFFER:
LOG_E(OTG, "Full buffer is not yet supported\n");
default:
LOG_D(OTG, "[SRC %d][DST %d] Unknown traffic type\n", i, j); LOG_D(OTG, "[SRC %d][DST %d] Unknown traffic type\n", i, j);
/* TO ADD: 3GPP TSG-RAN WG1 Meeting #71: Low-cost MTC Traffic Models and Characteristics */ /* TO ADD: 3GPP TSG-RAN WG1 Meeting #71: Low-cost MTC Traffic Models and Characteristics */
} }
} }
} }