Commit 20a8fdb7 authored by Stone WU's avatar Stone WU Committed by Jerome Peraldi

bug #125147: fix wrong subframe add function

parent 249e815e
...@@ -257,7 +257,7 @@ static void ss_task_handle_rrc_pdu_req(struct EUTRA_RRC_PDU_REQ *req) ...@@ -257,7 +257,7 @@ static void ss_task_handle_rrc_pdu_req(struct EUTRA_RRC_PDU_REQ *req)
SS_RRC_PDU_REQ(message_p).rnti = rnti_g; SS_RRC_PDU_REQ(message_p).rnti = rnti_g;
vt_add_sf(&req->Common.TimingInfo, -1); //RRC PDU schedule(if future timing) shall be ahead 1 subframe because of latency between RRC and PDCP vt_add_sf(&req->Common.TimingInfo, -2); //RRC PDU schedule(if future timing) shall be ahead 2 subframe because of latency between VT_Timer_task --RRC -- PDCP
if (!vt_timer_push_msg(&req->Common.TimingInfo, TASK_RRC_ENB, instance_g, message_p)) if (!vt_timer_push_msg(&req->Common.TimingInfo, TASK_RRC_ENB, instance_g, message_p))
{ {
itti_send_msg_to_task(TASK_RRC_ENB, instance_g, message_p); itti_send_msg_to_task(TASK_RRC_ENB, instance_g, message_p);
......
...@@ -117,8 +117,8 @@ void vt_add_sf(struct TimingInfo_Type* at, int offset) ...@@ -117,8 +117,8 @@ void vt_add_sf(struct TimingInfo_Type* at, int offset)
{ {
if (at != NULL && at->d == TimingInfo_Type_SubFrame) if (at != NULL && at->d == TimingInfo_Type_SubFrame)
{ {
uint8_t sfn = SS_context.sfn; uint16_t sfn = SS_context.sfn;
uint16_t sf = SS_context.sf; uint8_t sf = SS_context.sf;
if (at->v.SubFrame.SFN.d == SystemFrameNumberInfo_Type_Number) if (at->v.SubFrame.SFN.d == SystemFrameNumberInfo_Type_Number)
{ {
sfn = at->v.SubFrame.SFN.v.Number; sfn = at->v.SubFrame.SFN.v.Number;
...@@ -128,8 +128,8 @@ void vt_add_sf(struct TimingInfo_Type* at, int offset) ...@@ -128,8 +128,8 @@ void vt_add_sf(struct TimingInfo_Type* at, int offset)
{ {
sf = at->v.SubFrame.Subframe.v.Number; sf = at->v.SubFrame.Subframe.v.Number;
} }
LOG_D(ENB_SS_VT_TIMER,"vt_add_sf SFN %d SF %d offset %d\n",sfn,sf,offset);
_vt_add_sf(&sf, &sfn, offset); _vt_add_sf(&sfn, &sf, offset);
at->v.SubFrame.SFN.d = SystemFrameNumberInfo_Type_Number; at->v.SubFrame.SFN.d = SystemFrameNumberInfo_Type_Number;
at->v.SubFrame.SFN.v.Number = sfn; at->v.SubFrame.SFN.v.Number = sfn;
at->v.SubFrame.Subframe.d = SubFrameInfo_Type_Number; at->v.SubFrame.Subframe.d = SubFrameInfo_Type_Number;
......
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