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

bugfix for RAR UL grant (frame%1024)

Browse Source 
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@7601 818b1a75-f10b-46b9-bf7c-635c3b92a50f
This commit is contained in:
kaltenbe
2015-06-19 15:01:52 +00:00
parent 0f52ac5cd9
commit 7b999b7428
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair1/SCHED/phy_procedures_lte_common.c
+13 -13
View File
@@ -62,7 +62,7 @@ void get_Msg3_alloc(LTE_DL_FRAME_PARMS *frame_parms,
if (*subframe>9) { if (*subframe>9) {
*subframe = *subframe-10; *subframe = *subframe-10;
*frame = current_frame+1; *frame = (current_frame+1) & 1023;
} else { } else {
*frame=current_frame; *frame=current_frame;
} }
@@ -77,17 +77,17 @@ void get_Msg3_alloc(LTE_DL_FRAME_PARMS *frame_parms,
case 4: case 4:
*subframe = 2; *subframe = 2;
*frame = current_frame+1; *frame = (current_frame+1) & 1023;
break; break;
case 5: case 5:
*subframe = 2; *subframe = 2;
*frame = current_frame+1; *frame = (current_frame+1) & 1023;
break; break;
case 9: case 9:
*subframe = 7; *subframe = 7;
*frame = current_frame+1; *frame = (current_frame+1) & 1023;
break; break;
} }
} else if (frame_parms->tdd_config == 3) { } else if (frame_parms->tdd_config == 3) {
@@ -97,22 +97,22 @@ void get_Msg3_alloc(LTE_DL_FRAME_PARMS *frame_parms,
case 5: case 5:
case 6: case 6:
*subframe = 2; *subframe = 2;
*frame = current_frame+1; *frame = (current_frame+1) & 1023;
break; break;
case 7: case 7:
*subframe = 3; *subframe = 3;
*frame = current_frame+1; *frame = (current_frame+1) & 1023;
break; break;
case 8: case 8:
*subframe = 4; *subframe = 4;
*frame = current_frame+1; *frame = (current_frame+1) & 1023;
break; break;
case 9: case 9:
*subframe = 2; *subframe = 2;
*frame = current_frame+2; *frame = (current_frame+2) & 1023;
break; break;
} }
} }
@@ -127,11 +127,11 @@ void get_Msg3_alloc_ret(LTE_DL_FRAME_PARMS *frame_parms,
{ {
if (frame_parms->frame_type == FDD) { if (frame_parms->frame_type == FDD) {
// always retransmit in n+8 // always retransmit in n+8
*subframe = current_subframe+8; *subframe = (current_subframe+8) % 10;
if (*subframe>9) { if (*subframe>9) {
*subframe = *subframe-10; *subframe = *subframe-10;
*frame = current_frame+1; *frame = (current_frame+1) & 1023;
} else { } else {
*frame=current_frame; *frame=current_frame;
} }
@@ -141,12 +141,12 @@ void get_Msg3_alloc_ret(LTE_DL_FRAME_PARMS *frame_parms,
// original PUSCH in 3, PHICH in 9, ret in 3 // original PUSCH in 3, PHICH in 9, ret in 3
// original PUSCH in 7, PHICH in 1 (S), ret in 7 // original PUSCH in 7, PHICH in 1 (S), ret in 7
// original PUSCH in 8, PHICH in 4, ret in 8 // original PUSCH in 8, PHICH in 4, ret in 8
*frame = current_frame+1; *frame = (current_frame+1) & 1023;
} else if (frame_parms->tdd_config == 3) { } else if (frame_parms->tdd_config == 3) {
// original PUSCH in 2, PHICH in 8, ret in 2 next frame // original PUSCH in 2, PHICH in 8, ret in 2 next frame
// original PUSCH in 3, PHICH in 9, ret in 3 next frame // original PUSCH in 3, PHICH in 9, ret in 3 next frame
// original PUSCH in 4, PHICH in 0, ret in 4 next frame // original PUSCH in 4, PHICH in 0, ret in 4 next frame
*frame=current_frame+1; *frame=(current_frame+1) & 1023;
} }
} }
} }
@@ -161,7 +161,7 @@ uint8_t get_Msg3_harq_pid(LTE_DL_FRAME_PARMS *frame_parms,
if (frame_parms->frame_type ==FDD) { if (frame_parms->frame_type ==FDD) {
ul_subframe = (current_subframe>3) ? (current_subframe-4) : (current_subframe+6); ul_subframe = (current_subframe>3) ? (current_subframe-4) : (current_subframe+6);
ul_frame = (current_subframe>3) ? (frame+1) : frame; ul_frame = (current_subframe>3) ? ((frame+1)&1023) : frame;
} else { } else {
switch (frame_parms->tdd_config) { switch (frame_parms->tdd_config) {
case 1: case 1: