From 7b999b7428346a47a9d75729c4cf44de6cb7fb0a Mon Sep 17 00:00:00 2001
From: kaltenbe <kaltenbe@mycompany.com>
Date: Fri, 19 Jun 2015 15:01:52 +0000
Subject: [PATCH] bugfix for RAR UL grant (frame%1024)
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@7601 818b1a75-f10b-46b9-bf7c-635c3b92a50f
---
openair1/SCHED/phy_procedures_lte_common.c | 26 +++++++++++-----------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/openair1/SCHED/phy_procedures_lte_common.c b/openair1/SCHED/phy_procedures_lte_common.c
index bc2638f2b0..2745feecef 100755
--- a/openair1/SCHED/phy_procedures_lte_common.c
+++ b/openair1/SCHED/phy_procedures_lte_common.c
@@ -62,7 +62,7 @@ void get_Msg3_alloc(LTE_DL_FRAME_PARMS *frame_parms,
if (*subframe>9) {
*subframe = *subframe-10;
- *frame = current_frame+1;
+ *frame = (current_frame+1) & 1023;
} else {
*frame=current_frame;
}
@@ -77,17 +77,17 @@ void get_Msg3_alloc(LTE_DL_FRAME_PARMS *frame_parms,
case 4:
*subframe = 2;
- *frame = current_frame+1;
+ *frame = (current_frame+1) & 1023;
break;
case 5:
*subframe = 2;
- *frame = current_frame+1;
+ *frame = (current_frame+1) & 1023;
break;
case 9:
*subframe = 7;
- *frame = current_frame+1;
+ *frame = (current_frame+1) & 1023;
break;
}
} else if (frame_parms->tdd_config == 3) {
@@ -97,22 +97,22 @@ void get_Msg3_alloc(LTE_DL_FRAME_PARMS *frame_parms,
case 5:
case 6:
*subframe = 2;
- *frame = current_frame+1;
+ *frame = (current_frame+1) & 1023;
break;
case 7:
*subframe = 3;
- *frame = current_frame+1;
+ *frame = (current_frame+1) & 1023;
break;
case 8:
*subframe = 4;
- *frame = current_frame+1;
+ *frame = (current_frame+1) & 1023;
break;
case 9:
*subframe = 2;
- *frame = current_frame+2;
+ *frame = (current_frame+2) & 1023;
break;
}
}
@@ -127,11 +127,11 @@ void get_Msg3_alloc_ret(LTE_DL_FRAME_PARMS *frame_parms,
{
if (frame_parms->frame_type == FDD) {
// always retransmit in n+8
- *subframe = current_subframe+8;
+ *subframe = (current_subframe+8) % 10;
if (*subframe>9) {
*subframe = *subframe-10;
- *frame = current_frame+1;
+ *frame = (current_frame+1) & 1023;
} else {
*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 7, PHICH in 1 (S), ret in 7
// 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) {
// 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 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) {
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 {
switch (frame_parms->tdd_config) {
case 1:
--
GitLab