Skip to content

P
PPSi
Commit 6c05e20c authored by Sven Meier's avatar Sven Meier
Browse files
Options

utc: handling of flags fixed, have to be reset as well

parent 3b65bd48
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 1 deletion
proto-standard/bmc.c
View file @ 6c05e20c
......@@ -183,7 +183,7 @@ void bmc_s1(struct pp_instance *ppi,
} else {
if (((leap59 != 0) != ((frgn_master->flagField[1] & FFB_LI59) != 0)) ||
((leap61 != 0) != ((frgn_master->flagField[1] & FFB_LI59) != 0)) ||
((leap61 != 0) != ((frgn_master->flagField[1] & FFB_LI61) != 0)) ||
(offset != frgn_master->currentUtcOffset)) {
prop->leap59 = ((frgn_master->flagField[1] & FFB_LI59) != 0);
prop->leap61 = ((frgn_master->flagField[1] & FFB_LI61) != 0);
......
time-unix/unix-time.c
View file @ 6c05e20c
......@@ -106,6 +106,15 @@ static int unix_time_set_utc_offset(struct pp_instance *ppi, int offset, int lea
pp_diag(ppi, time, 1, "set leap second failed");
return -1;
}
} else {
memset(&t, 0, sizeof(t));
t.modes = MOD_STATUS;
t.status = 0;
if (adjtimex(&t) < 0) {
pp_diag(ppi, time, 1, "clear leap second failed");
return -1;
}
}
memset(&t, 0, sizeof(t));
......
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