Commit 04a541c3 authored by Florian Kaltenberger's avatar Florian Kaltenberger

Merge branch 'bugfix-48-L1L2signaling' of...

Merge branch 'bugfix-48-L1L2signaling' of https://gitlab.eurecom.fr/oai/openairinterface5g into bugfix-48-L1L2signaling
parents a4ea1f9b f6beede7
...@@ -734,11 +734,11 @@ void generate_RIV_tables() ...@@ -734,11 +734,11 @@ void generate_RIV_tables()
if (nVRB<32) if (nVRB<32)
alloc0 |= (1<<nVRB); alloc0 |= (1<<nVRB);
else if (nVRB<64) else if (nVRB<64)
alloc1 |= (1<<(nVRB-33)); alloc1 |= (1<<(nVRB-32));
else if (nVRB<96) else if (nVRB<96)
alloc2 |= (1<<(nVRB-65)); alloc2 |= (1<<(nVRB-64));
else else
alloc3 |= (1<<(nVRB-97)); alloc3 |= (1<<(nVRB-96));
// Distributed Gap1, even slot // Distributed Gap1, even slot
nVRB_even_dist = get_prb(100,0,nVRB,0); nVRB_even_dist = get_prb(100,0,nVRB,0);
...@@ -770,9 +770,9 @@ void generate_RIV_tables() ...@@ -770,9 +770,9 @@ void generate_RIV_tables()
else if (nVRB_odd_dist<64) else if (nVRB_odd_dist<64)
allocdist1_0_odd |= (1<<(nVRB_odd_dist-32)); allocdist1_0_odd |= (1<<(nVRB_odd_dist-32));
else if (nVRB_odd_dist<96) else if (nVRB_odd_dist<96)
allocdist2_0_odd |= (1<<(nVRB_odd_dist-65)); allocdist2_0_odd |= (1<<(nVRB_odd_dist-64));
else else
allocdist3_0_odd |= (1<<(nVRB_odd_dist-97)); allocdist3_0_odd |= (1<<(nVRB_odd_dist-96));
// Distributed Gap2, even slot // Distributed Gap2, even slot
......
...@@ -991,13 +991,11 @@ int allocate_CCEs(int module_idP, ...@@ -991,13 +991,11 @@ int allocate_CCEs(int module_idP,
int allocation_is_feasible = 1; int allocation_is_feasible = 1;
DCI_ALLOC_t *dci_alloc; DCI_ALLOC_t *dci_alloc;
LOG_D(MAC,"Allocate CCEs subframe %d, test %d : (common %d,uspec %d)\n",subframeP,test_onlyP,DCI_pdu->Num_common_dci,DCI_pdu->Num_ue_spec_dci); LOG_D(MAC,"Allocate CCEs subframe %d, test %d : (common %d,uspec %d)\n",subframeP,test_onlyP,DCI_pdu->Num_common_dci,DCI_pdu->Num_ue_spec_dci);
init_CCE_table(module_idP,CC_idP);
DCI_pdu->nCCE=0;
while (allocation_is_feasible == 1) { while (allocation_is_feasible == 1) {
init_CCE_table(module_idP,CC_idP);
DCI_pdu->nCCE=0;
for (i=0;i<DCI_pdu->Num_common_dci + DCI_pdu->Num_ue_spec_dci;i++) { for (i=0;i<DCI_pdu->Num_common_dci + DCI_pdu->Num_ue_spec_dci;i++) {
dci_alloc = &DCI_pdu->dci_alloc[i]; dci_alloc = &DCI_pdu->dci_alloc[i];
......
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