Skip to content

O
OpenXG-RAN
Commit 34b4c19c authored by masayuki.harada's avatar masayuki.harada Committed by Haruki NAOI
Browse files
Options

Delete minor adjust by p7 message. 

(cherry picked from commit 11485a6f7b76288e3db58435717afb4e5e63b0eb)
parent c1a032ff
Hide whitespace changes
Inline Side-by-side
Showing with 44 additions and 44 deletions
nfapi/open-nFAPI/vnf/src/vnf_p7.c
View file @ 34b4c19c
...@@ -1170,19 +1170,19 @@ void vnf_handle_ul_node_sync(void *pRecvMsg, int recvMsgLen, vnf_p7_t* vnf_p7) ...@@ -1170,19 +1170,19 @@ void vnf_handle_ul_node_sync(void *pRecvMsg, int recvMsgLen, vnf_p7_t* vnf_p7)
if(phy->in_sync) if(phy->in_sync)
{ {
// in sync // in sync
if(phy->sf_offset_filtered > 250) //if(phy->sf_offset_filtered > 250)
{ //{
// VNF is slow // // VNF is slow
phy->insync_minor_adjustment = insync_minor_adjustment_1; //25; // phy->insync_minor_adjustment = insync_minor_adjustment_1; //25;
phy->insync_minor_adjustment_duration = ((phy->sf_offset_filtered) / insync_minor_adjustment_1); // phy->insync_minor_adjustment_duration = ((phy->sf_offset_filtered) / insync_minor_adjustment_1);
} //}
else if(phy->sf_offset_filtered < -250) //else if(phy->sf_offset_filtered < -250)
{ //{
// VNF is fast // // VNF is fast
phy->insync_minor_adjustment = -(insync_minor_adjustment_1); //25; // phy->insync_minor_adjustment = -(insync_minor_adjustment_1); //25;
phy->insync_minor_adjustment_duration = (((phy->sf_offset_filtered) / -(insync_minor_adjustment_1))); // phy->insync_minor_adjustment_duration = (((phy->sf_offset_filtered) / -(insync_minor_adjustment_1)));
} //}
else //else
{ {
phy->insync_minor_adjustment = 0; phy->insync_minor_adjustment = 0;
} }
...@@ -1211,22 +1211,22 @@ void vnf_handle_ul_node_sync(void *pRecvMsg, int recvMsgLen, vnf_p7_t* vnf_p7) ...@@ -1211,22 +1211,22 @@ void vnf_handle_ul_node_sync(void *pRecvMsg, int recvMsgLen, vnf_p7_t* vnf_p7)
{ {
// VNF is slow // VNF is slow
//if(phy->adjustment == 1) //if(phy->adjustment == 1)
{ //{
// //
if(phy->sf_offset_filtered > 250) // if(phy->sf_offset_filtered > 250)
{ // {
// VNF is slow // // VNF is slow
phy->insync_minor_adjustment = insync_minor_adjustment_2; // phy->insync_minor_adjustment = insync_minor_adjustment_2;
phy->insync_minor_adjustment_duration = 2 * ((phy->sf_offset_filtered - 250) / insync_minor_adjustment_2); // phy->insync_minor_adjustment_duration = 2 * ((phy->sf_offset_filtered - 250) / insync_minor_adjustment_2);
} // }
else if(phy->sf_offset_filtered < -250) // else if(phy->sf_offset_filtered < -250)
{ // {
// VNF is fast // // VNF is fast
phy->insync_minor_adjustment = -(insync_minor_adjustment_2); // phy->insync_minor_adjustment = -(insync_minor_adjustment_2);
phy->insync_minor_adjustment_duration = 2 * ((phy->sf_offset_filtered + 250) / -(insync_minor_adjustment_2)); // phy->insync_minor_adjustment_duration = 2 * ((phy->sf_offset_filtered + 250) / -(insync_minor_adjustment_2));
} // }
//
} //}
//else //else
{ {
// out of sync? // out of sync?
...@@ -1245,21 +1245,21 @@ void vnf_handle_ul_node_sync(void *pRecvMsg, int recvMsgLen, vnf_p7_t* vnf_p7) ...@@ -1245,21 +1245,21 @@ void vnf_handle_ul_node_sync(void *pRecvMsg, int recvMsgLen, vnf_p7_t* vnf_p7)
{ {
// VNF is fast // VNF is fast
//if(phy->adjustment == -1) //if(phy->adjustment == -1)
{ //{
// // //
if(phy->sf_offset_filtered > 250) // if(phy->sf_offset_filtered > 250)
{ // {
// VNF is slow // // VNF is slow
phy->insync_minor_adjustment = insync_minor_adjustment_2; // phy->insync_minor_adjustment = insync_minor_adjustment_2;
phy->insync_minor_adjustment_duration = 2 * ((phy->sf_offset_filtered - 250) / insync_minor_adjustment_2); // phy->insync_minor_adjustment_duration = 2 * ((phy->sf_offset_filtered - 250) / insync_minor_adjustment_2);
} // }
else if(phy->sf_offset_filtered < -250) // else if(phy->sf_offset_filtered < -250)
{ // {
// VNF is fast // // VNF is fast
phy->insync_minor_adjustment = -(insync_minor_adjustment_2); // phy->insync_minor_adjustment = -(insync_minor_adjustment_2);
phy->insync_minor_adjustment_duration = 2 * ((phy->sf_offset_filtered + 250) / -(insync_minor_adjustment_2)); // phy->insync_minor_adjustment_duration = 2 * ((phy->sf_offset_filtered + 250) / -(insync_minor_adjustment_2));
} // }
} //}
//else //else
{ {
// out of sync? // out of sync?
......
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