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

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@5951 818b1a75-f10b-46b9-bf7c-635c3b92a50f

Browse Source
This commit is contained in:
Raymond Knopp
2014-10-31 18:20:40 +00:00
parent 13483270a1
commit 7785b5aa3d
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/LAYER2/MAC/defs.h
+1 -1
View File
@@ -646,7 +646,7 @@ typedef struct {
///subband bitmap coniguration (for ALU icic algo purpose), in test phase ///subband bitmap coniguration (for ALU icic algo purpose), in test phase
typedef struct{ typedef struct{
uint8_t sbmap[NUMBER_OF_SUBBANDS]; //13 = number of SB MAX for 100 PRB uint8_t sbmap[NUMBER_OF_SUBBANDS_MAX]; //13 = number of SB MAX for 100 PRB
uint8_t periodicity; uint8_t periodicity;
uint8_t first_subframe; uint8_t first_subframe;
uint8_t sb_size; uint8_t sb_size;
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
+3 -2
View File
@@ -714,12 +714,13 @@ uint32_t allocate_prbs_sub(int nb_rb, uint8_t *rballoc) {
LOG_T(MAC,"*****Check1RBALLOC****: %d%d%d%d (nb_rb %d,N_RBG %d)\n", LOG_T(MAC,"*****Check1RBALLOC****: %d%d%d%d (nb_rb %d,N_RBG %d)\n",
rballoc[3],rballoc[2],rballoc[1],rballoc[0],nb_rb,mac_xface->lte_frame_parms->N_RBG); rballoc[3],rballoc[2],rballoc[1],rballoc[0],nb_rb,mac_xface->lte_frame_parms->N_RBG);
while((nb_rb >0) && (check < mac_xface->lte_frame_parms->N_RBG)){ while((nb_rb >0) && (check < mac_xface->lte_frame_parms->N_RBG)){
//printf("rballoc[%d] %d\n",check,rballoc[check]); //printf("rballoc[%d] %d\n",check,rballoc[check]);
if(rballoc[check] == 1){ if(rballoc[check] == 1){
rballoc_dci |= (1<<((mac_xface->lte_frame_parms->N_RBG-1)-check)); rballoc_dci |= (1<<((mac_xface->lte_frame_parms->N_RBG-1)-check));
switch (mac_xface->lte_frame_parms->N_RB_DL) { switch (mac_xface->lte_frame_parms->N_RB_DL) {
case 6: case 6:
nb_rb--; nb_rb--;
break;
case 25: case 25:
if ((check == mac_xface->lte_frame_parms->N_RBG-1)) if ((check == mac_xface->lte_frame_parms->N_RBG-1))
nb_rb--; nb_rb--;
@@ -737,7 +738,7 @@ uint32_t allocate_prbs_sub(int nb_rb, uint8_t *rballoc) {
break; break;
} }
} }
//printf("rb_alloc %x\n",rballoc_dci); // printf("rb_alloc %x\n",rballoc_dci);
check = check+1; check = check+1;
// check1 = check1+2; // check1 = check1+2;
} }