Skip to content

P
PPSi
Commit a79b0d7f authored by Alessandro Rubini's avatar Alessandro Rubini
Browse files
Options

servo: introduce helper function (no technical effect) 

This moves the currenct checks for bad events into a specific function.
Some duplication is removed in that function and log messages are
slightly different, but no technical change is in charge.

I'm going to use pp_servo_bad_event() in later commits.
Signed-off-by: Alessandro Rubini's avatarAlessandro Rubini <rubini@gnudd.com>
parent 3e6c1255
Hide whitespace changes
Inline Side-by-side
Showing with 31 additions and 32 deletions
proto-standard/servo.c
View file @ a79b0d7f
......@@ -50,6 +50,35 @@ void pp_servo_got_sync(struct pp_instance *ppi)
fmt_TI(&ppi->cField));
}
/*
* This function makes the necessary checks to discard a set of t1..t4.
* It relies on owd to be already calculated.
*/
static int pp_servo_bad_event(struct pp_instance *ppi)
{
TimeInternal *m_to_s_dly = &SRV(ppi)->m_to_s_dly;
TimeInternal *s_to_m_dly = &SRV(ppi)->s_to_m_dly;
if (OPTS(ppi)->max_dly) { /* If maxDelay is 0 then it's OFF */
if (m_to_s_dly->seconds || s_to_m_dly->seconds) {
pp_diag(ppi, servo, 1,"servo aborted, delay greater "
"than 1 second\n");
return 1;
}
if (m_to_s_dly->nanoseconds > OPTS(ppi)->max_dly ||
s_to_m_dly->nanoseconds > OPTS(ppi)->max_dly) {
pp_diag(ppi, servo, 1, "servo aborted, delay %d or %d "
"greater than configured maximum %d\n",
(int)m_to_s_dly->nanoseconds,
(int)s_to_m_dly->nanoseconds,
(int)OPTS(ppi)->max_dly);
return 1;
}
}
return 0;
}
/* called by slave states when delay_resp is received (all t1..t4 are valid) */
void pp_servo_got_resp(struct pp_instance *ppi)
{
......@@ -82,38 +111,8 @@ void pp_servo_got_resp(struct pp_instance *ppi)
div2_TimeInternal(owd);
pp_diag(ppi, servo, 1, "One-way delay: %s\n", fmt_TI(owd));
/* Check for too-big offsets, and then make the calculation */
if (OPTS(ppi)->max_dly) { /* If maxDelay is 0 then it's OFF */
if (m_to_s_dly->seconds) {
pp_diag(ppi, servo, 1, "%s aborted, delay greater "
"than 1 second\n", __func__);
return;
}
if (m_to_s_dly->nanoseconds > OPTS(ppi)->max_dly) {
pp_diag(ppi, servo, 1, "%s aborted, delay %d greater "
"than administratively set maximum %d\n",
__func__,
(int)m_to_s_dly->nanoseconds,
(int)OPTS(ppi)->max_dly);
return;
}
if (s_to_m_dly->seconds) {
pp_diag(ppi, servo, 1, "%s aborted, delay "
"greater than 1 second\n", __func__);
return;
}
if (s_to_m_dly->nanoseconds > OPTS(ppi)->max_dly)
pp_diag(ppi, servo, 1, "%s aborted, delay %d greater "
"than administratively set maximum %d\n",
__func__,
(int)s_to_m_dly->nanoseconds,
(int)OPTS(ppi)->max_dly);
if (s_to_m_dly->nanoseconds > OPTS(ppi)->max_dly)
return;
}
if(pp_servo_bad_event(ppi))
return;
if (owd->seconds) {
/* cannot filter with secs, clear filter */
......
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