From 7d8eb4d7f97daedeca6b4a9fd45a6ea1a03d9c9d Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Thu, 16 Nov 2017 20:53:14 +0100 Subject: [PATCH] time: Address review comments. * Use ENOSYS not B_DONT_DO_THAT (thanks korli) * Use unsigned long not uint64 (thanks axeld) --- headers/os/kernel/OS.h | 4 ++-- src/system/kernel/real_time_clock.cpp | 4 ++-- src/system/libroot/os/time.cpp | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/headers/os/kernel/OS.h b/headers/os/kernel/OS.h index 0ea55ce01b..e5afd9ff94 100644 --- a/headers/os/kernel/OS.h +++ b/headers/os/kernel/OS.h @@ -373,8 +373,8 @@ extern status_t convert_to_pthread(thread_id thread, pthread_t *_thread); /* Time */ -extern uint32 real_time_clock(void); -extern void set_real_time_clock(uint64 secsSinceJan1st1970); +extern unsigned long real_time_clock(void); +extern void set_real_time_clock(unsigned long secsSinceJan1st1970); extern bigtime_t real_time_clock_usecs(void); extern bigtime_t system_time(void); /* time since booting in microseconds */ diff --git a/src/system/kernel/real_time_clock.cpp b/src/system/kernel/real_time_clock.cpp index bd2faa1e3b..7db88c24f9 100644 --- a/src/system/kernel/real_time_clock.cpp +++ b/src/system/kernel/real_time_clock.cpp @@ -123,13 +123,13 @@ set_real_time_clock_usecs(bigtime_t currentTime) void -set_real_time_clock(uint64 currentTime) +set_real_time_clock(unsigned long currentTime) { set_real_time_clock_usecs((bigtime_t)currentTime * 1000000); } -uint32 +unsigned long real_time_clock(void) { return (arch_rtc_get_system_time_offset(sRealTimeData) + system_time()) diff --git a/src/system/libroot/os/time.cpp b/src/system/libroot/os/time.cpp index 658ec3f843..5bf32fae7b 100644 --- a/src/system/libroot/os/time.cpp +++ b/src/system/libroot/os/time.cpp @@ -44,7 +44,7 @@ __get_system_time_offset() // #pragma mark - public API -uint32 +unsigned long real_time_clock(void) { return (__arch_get_system_time_offset(sRealTimeData) + system_time()) @@ -60,7 +60,7 @@ real_time_clock_usecs(void) void -set_real_time_clock(uint64 secs) +set_real_time_clock(unsigned long secs) { _kern_set_real_time_clock((bigtime_t)secs * 1000000); } @@ -74,7 +74,7 @@ set_timezone(const char* /*timezone*/) * * TODO: should we keep this around for compatibility or get rid of it? */ - return B_DONT_DO_THAT; + return ENOSYS; }