Skip to content

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

time-wrs: fall back on unix time 

When setting time, set Unix time as well. And when asking for the time,
return Unix time if the WR inter process communication fails.

Currently (and in all past history) the IPC call to get the time is
not implemented, so we are sure we fail. But I keep it in place nonetheless
in case we'll have it working in the future. Such time_get calls are
mainly for timestamping the diagnostic messages anyways.
Signed-off-by: Alessandro Rubini's avatarAlessandro Rubini <rubini@gnudd.com>
parent 33a6d159
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 5 deletions
time-wrs/wrs-time.c
View file @ de877246
......@@ -168,10 +168,17 @@ static int wrs_time_get(struct pp_instance *ppi, TimeInternal *t)
int cmd;
int ret, rval;
cmd = HEXP_PPSG_CMD_GET;
cmd = HEXP_PPSG_CMD_GET; /* likely not implemented... */
ret = minipc_call(hal_ch, DEFAULT_TO, &__rpcdef_pps_cmd, &rval,
cmd, &p);
if (ret < 0 || rval < 0) {
/*
* It failed, so fall back on unix time. Please note
* that these times are mainly for logging, nothing
* critical is there, as T1..T4 are frame stamps.
*/
return unix_time_ops.get(ppi, t);
}
/* FIXME Don't know whether p.current_phase_shift is to be assigned
* to t->phase or t->raw_phase. I ignore it, it's not useful here. */
......@@ -179,9 +186,6 @@ static int wrs_time_get(struct pp_instance *ppi, TimeInternal *t)
t->nanoseconds = p.current_nsec;
t->correct = p.pps_valid;
if (ret < 0)
return ret;
if (!(pp_global_flags & PP_FLAG_NOTIMELOG))
pp_diag(ppi, time, 2, "%s: (valid %x) %9li.%09li\n", __func__,
p.pps_valid,
......@@ -196,6 +200,8 @@ static int32_t wrs_time_set(struct pp_instance *ppi, TimeInternal *t)
* time */
pp_diag(ppi, time, 1, "%s: (not supported) %9li.%09li\n", __func__,
(long)t->seconds, (long)t->nanoseconds);
/* Set unix time anyways */
unix_time_ops.set(ppi, t);
return -ENOTSUP;
}
......
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