Fix incorrect merge of os_time.c
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/commit/f89e287b Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/tree/f89e287b Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/diff/f89e287b Branch: refs/heads/master Commit: f89e287b9dcafa9106e1304c1b9c69c851f17911 Parents: f208e19 Author: wes3 <w...@micosa.io> Authored: Sun Mar 6 11:18:36 2016 -0800 Committer: wes3 <w...@micosa.io> Committed: Sun Mar 6 11:18:36 2016 -0800 ---------------------------------------------------------------------- libs/os/src/os_time.c | 21 --------------------- 1 file changed, 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/blob/f89e287b/libs/os/src/os_time.c ---------------------------------------------------------------------- diff --git a/libs/os/src/os_time.c b/libs/os/src/os_time.c index 520747c..1b703e0 100644 --- a/libs/os/src/os_time.c +++ b/libs/os/src/os_time.c @@ -45,27 +45,6 @@ os_deltatime(os_time_t delta, const struct os_timeval *base, os_timeradd(base, &tvdelta, result); } -/* - * Time-of-day collateral. - */ -static struct { - os_time_t ostime; - struct os_timeval uptime; - struct os_timeval utctime; - struct os_timezone timezone; -} basetod; - -static void -os_deltatime(os_time_t delta, const struct os_timeval *base, - struct os_timeval *result) -{ - struct os_timeval tvdelta; - - tvdelta.tv_sec = delta / OS_TICKS_PER_SEC; - tvdelta.tv_usec = (delta % OS_TICKS_PER_SEC) * OS_USEC_PER_TICK; - os_timeradd(base, &tvdelta, result); -} - os_time_t os_time_get(void) {
