diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2017-10-24 11:17:54 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2017-11-09 08:12:12 +0100 |
| commit | 5f02a574783d3ee5fa5e119af1a2d5e163dd1143 (patch) | |
| tree | fc3aedafc4fbdf86b370ab3e3593f256cc208b85 /cpukit/score | |
| parent | Upgrade to 5.0.0 (diff) | |
| download | rtems-5f02a574783d3ee5fa5e119af1a2d5e163dd1143.tar.bz2 | |
score: Change _Timecounter_Time_uptime to int32_t
Move basic timecounter API shared with BSD network stack to
<machine/_timecounter.h>.
Update #3185.
Diffstat (limited to 'cpukit/score')
| -rw-r--r-- | cpukit/score/include/rtems/score/timecounter.h | 3 | ||||
| -rw-r--r-- | cpukit/score/src/kern_tc.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/cpukit/score/include/rtems/score/timecounter.h b/cpukit/score/include/rtems/score/timecounter.h index 1c318e2a78..79444de482 100644 --- a/cpukit/score/include/rtems/score/timecounter.h +++ b/cpukit/score/include/rtems/score/timecounter.h @@ -25,6 +25,7 @@ #include <sys/time.h> #include <sys/timetc.h> +#include <machine/_timecounter.h> #include <rtems/score/isrlock.h> @@ -227,7 +228,7 @@ extern volatile time_t _Timecounter_Time_second; * For compatibility with the FreeBSD network stack the initial value is one * second. */ -extern volatile time_t _Timecounter_Time_uptime; +extern volatile int32_t _Timecounter_Time_uptime; /** * @brief The current timecounter. diff --git a/cpukit/score/src/kern_tc.c b/cpukit/score/src/kern_tc.c index 55aa0ae255..99c6664fcb 100644 --- a/cpukit/score/src/kern_tc.c +++ b/cpukit/score/src/kern_tc.c @@ -203,10 +203,11 @@ int tc_min_ticktock_freq = 1; #ifndef __rtems__ volatile time_t time_second = 1; +volatile time_t time_uptime = 1; #else /* __rtems__ */ volatile time_t time_second = TOD_SECONDS_1970_THROUGH_1988; +volatile int32_t time_uptime = 1; #endif /* __rtems__ */ -volatile time_t time_uptime = 1; #ifndef __rtems__ static int sysctl_kern_boottime(SYSCTL_HANDLER_ARGS); |