diff options
Diffstat (limited to '')
| -rw-r--r-- | src/core/hle/service/time/interface.cpp | 2 | ||||
| -rw-r--r-- | src/core/hle/service/time/time.cpp | 132 | ||||
| -rw-r--r-- | src/core/hle/service/time/time.h | 19 |
3 files changed, 132 insertions, 21 deletions
diff --git a/src/core/hle/service/time/interface.cpp b/src/core/hle/service/time/interface.cpp index 18a5d71d5..e3cbd7004 100644 --- a/src/core/hle/service/time/interface.cpp +++ b/src/core/hle/service/time/interface.cpp | |||
| @@ -21,7 +21,7 @@ Time::Time(std::shared_ptr<Module> time, const char* name) | |||
| 21 | {102, nullptr, "GetStandardUserSystemClockInitialYear"}, | 21 | {102, nullptr, "GetStandardUserSystemClockInitialYear"}, |
| 22 | {200, nullptr, "IsStandardNetworkSystemClockAccuracySufficient"}, | 22 | {200, nullptr, "IsStandardNetworkSystemClockAccuracySufficient"}, |
| 23 | {300, nullptr, "CalculateMonotonicSystemClockBaseTimePoint"}, | 23 | {300, nullptr, "CalculateMonotonicSystemClockBaseTimePoint"}, |
| 24 | {400, nullptr, "GetClockSnapshot"}, | 24 | {400, &Time::GetClockSnapshot, "GetClockSnapshot"}, |
| 25 | {401, nullptr, "GetClockSnapshotFromSystemClockContext"}, | 25 | {401, nullptr, "GetClockSnapshotFromSystemClockContext"}, |
| 26 | {500, nullptr, "CalculateStandardUserSystemClockDifferenceByUser"}, | 26 | {500, nullptr, "CalculateStandardUserSystemClockDifferenceByUser"}, |
| 27 | {501, nullptr, "CalculateSpanBetween"}, | 27 | {501, nullptr, "CalculateSpanBetween"}, |
diff --git a/src/core/hle/service/time/time.cpp b/src/core/hle/service/time/time.cpp index 28fd8debc..85e7b1195 100644 --- a/src/core/hle/service/time/time.cpp +++ b/src/core/hle/service/time/time.cpp | |||
| @@ -15,6 +15,44 @@ | |||
| 15 | 15 | ||
| 16 | namespace Service::Time { | 16 | namespace Service::Time { |
| 17 | 17 | ||
| 18 | static void PosixToCalendar(u64 posix_time, CalendarTime& calendar_time, | ||
| 19 | CalendarAdditionalInfo& additional_info, | ||
| 20 | [[maybe_unused]] const TimeZoneRule& /*rule*/) { | ||
| 21 | const std::time_t time(posix_time); | ||
| 22 | const std::tm* tm = std::localtime(&time); | ||
| 23 | if (tm == nullptr) { | ||
| 24 | calendar_time = {}; | ||
| 25 | additional_info = {}; | ||
| 26 | return; | ||
| 27 | } | ||
| 28 | calendar_time.year = tm->tm_year + 1900; | ||
| 29 | calendar_time.month = tm->tm_mon + 1; | ||
| 30 | calendar_time.day = tm->tm_mday; | ||
| 31 | calendar_time.hour = tm->tm_hour; | ||
| 32 | calendar_time.minute = tm->tm_min; | ||
| 33 | calendar_time.second = tm->tm_sec; | ||
| 34 | |||
| 35 | additional_info.day_of_week = tm->tm_wday; | ||
| 36 | additional_info.day_of_year = tm->tm_yday; | ||
| 37 | std::memcpy(additional_info.name.data(), "UTC", sizeof("UTC")); | ||
| 38 | additional_info.utc_offset = 0; | ||
| 39 | } | ||
| 40 | |||
| 41 | static u64 CalendarToPosix(const CalendarTime& calendar_time, | ||
| 42 | [[maybe_unused]] const TimeZoneRule& /*rule*/) { | ||
| 43 | std::tm time{}; | ||
| 44 | time.tm_year = calendar_time.year - 1900; | ||
| 45 | time.tm_mon = calendar_time.month - 1; | ||
| 46 | time.tm_mday = calendar_time.day; | ||
| 47 | |||
| 48 | time.tm_hour = calendar_time.hour; | ||
| 49 | time.tm_min = calendar_time.minute; | ||
| 50 | time.tm_sec = calendar_time.second; | ||
| 51 | |||
| 52 | std::time_t epoch_time = std::mktime(&time); | ||
| 53 | return static_cast<u64>(epoch_time); | ||
| 54 | } | ||
| 55 | |||
| 18 | class ISystemClock final : public ServiceFramework<ISystemClock> { | 56 | class ISystemClock final : public ServiceFramework<ISystemClock> { |
| 19 | public: | 57 | public: |
| 20 | ISystemClock() : ServiceFramework("ISystemClock") { | 58 | ISystemClock() : ServiceFramework("ISystemClock") { |
| @@ -80,8 +118,8 @@ public: | |||
| 80 | {5, nullptr, "GetTimeZoneRuleVersion"}, | 118 | {5, nullptr, "GetTimeZoneRuleVersion"}, |
| 81 | {100, &ITimeZoneService::ToCalendarTime, "ToCalendarTime"}, | 119 | {100, &ITimeZoneService::ToCalendarTime, "ToCalendarTime"}, |
| 82 | {101, &ITimeZoneService::ToCalendarTimeWithMyRule, "ToCalendarTimeWithMyRule"}, | 120 | {101, &ITimeZoneService::ToCalendarTimeWithMyRule, "ToCalendarTimeWithMyRule"}, |
| 83 | {201, nullptr, "ToPosixTime"}, | 121 | {201, &ITimeZoneService::ToPosixTime, "ToPosixTime"}, |
| 84 | {202, nullptr, "ToPosixTimeWithMyRule"}, | 122 | {202, &ITimeZoneService::ToPosixTimeWithMyRule, "ToPosixTimeWithMyRule"}, |
| 85 | }; | 123 | }; |
| 86 | RegisterHandlers(functions); | 124 | RegisterHandlers(functions); |
| 87 | } | 125 | } |
| @@ -151,24 +189,29 @@ private: | |||
| 151 | rb.PushRaw(additional_info); | 189 | rb.PushRaw(additional_info); |
| 152 | } | 190 | } |
| 153 | 191 | ||
| 154 | void PosixToCalendar(u64 posix_time, CalendarTime& calendar_time, | 192 | void ToPosixTime(Kernel::HLERequestContext& ctx) { |
| 155 | CalendarAdditionalInfo& additional_info, const TimeZoneRule& /*rule*/) { | 193 | // TODO(ogniK): Figure out how to handle multiple times |
| 156 | std::time_t t(posix_time); | 194 | LOG_WARNING(Service_Time, "(STUBBED) called"); |
| 157 | std::tm* tm = std::localtime(&t); | 195 | IPC::RequestParser rp{ctx}; |
| 158 | if (!tm) { | 196 | auto calendar_time = rp.PopRaw<CalendarTime>(); |
| 159 | return; | 197 | auto posix_time = CalendarToPosix(calendar_time, {}); |
| 160 | } | 198 | |
| 161 | calendar_time.year = tm->tm_year + 1900; | 199 | IPC::ResponseBuilder rb{ctx, 3}; |
| 162 | calendar_time.month = tm->tm_mon + 1; | 200 | rb.Push(RESULT_SUCCESS); |
| 163 | calendar_time.day = tm->tm_mday; | 201 | rb.PushRaw<u32>(1); // Amount of times we're returning |
| 164 | calendar_time.hour = tm->tm_hour; | 202 | ctx.WriteBuffer(&posix_time, sizeof(u64)); |
| 165 | calendar_time.minute = tm->tm_min; | 203 | } |
| 166 | calendar_time.second = tm->tm_sec; | 204 | |
| 167 | 205 | void ToPosixTimeWithMyRule(Kernel::HLERequestContext& ctx) { | |
| 168 | additional_info.day_of_week = tm->tm_wday; | 206 | LOG_WARNING(Service_Time, "(STUBBED) called"); |
| 169 | additional_info.day_of_year = tm->tm_yday; | 207 | IPC::RequestParser rp{ctx}; |
| 170 | std::memcpy(additional_info.name.data(), "UTC", sizeof("UTC")); | 208 | auto calendar_time = rp.PopRaw<CalendarTime>(); |
| 171 | additional_info.utc_offset = 0; | 209 | auto posix_time = CalendarToPosix(calendar_time, {}); |
| 210 | |||
| 211 | IPC::ResponseBuilder rb{ctx, 3}; | ||
| 212 | rb.Push(RESULT_SUCCESS); | ||
| 213 | rb.PushRaw<u32>(1); // Amount of times we're returning | ||
| 214 | ctx.WriteBuffer(&posix_time, sizeof(u64)); | ||
| 172 | } | 215 | } |
| 173 | }; | 216 | }; |
| 174 | 217 | ||
| @@ -207,6 +250,55 @@ void Module::Interface::GetStandardLocalSystemClock(Kernel::HLERequestContext& c | |||
| 207 | LOG_DEBUG(Service_Time, "called"); | 250 | LOG_DEBUG(Service_Time, "called"); |
| 208 | } | 251 | } |
| 209 | 252 | ||
| 253 | void Module::Interface::GetClockSnapshot(Kernel::HLERequestContext& ctx) { | ||
| 254 | LOG_DEBUG(Service_Time, "called"); | ||
| 255 | |||
| 256 | IPC::RequestParser rp{ctx}; | ||
| 257 | auto unknown_u8 = rp.PopRaw<u8>(); | ||
| 258 | |||
| 259 | ClockSnapshot clock_snapshot{}; | ||
| 260 | |||
| 261 | const s64 time_since_epoch{std::chrono::duration_cast<std::chrono::seconds>( | ||
| 262 | std::chrono::system_clock::now().time_since_epoch()) | ||
| 263 | .count()}; | ||
| 264 | CalendarTime calendar_time{}; | ||
| 265 | const std::time_t time(time_since_epoch); | ||
| 266 | const std::tm* tm = std::localtime(&time); | ||
| 267 | if (tm == nullptr) { | ||
| 268 | IPC::ResponseBuilder rb{ctx, 2}; | ||
| 269 | rb.Push(ResultCode(-1)); // TODO(ogniK): Find appropriate error code | ||
| 270 | return; | ||
| 271 | } | ||
| 272 | SteadyClockTimePoint steady_clock_time_point{CoreTiming::cyclesToMs(CoreTiming::GetTicks()) / | ||
| 273 | 1000}; | ||
| 274 | |||
| 275 | LocationName location_name{"UTC"}; | ||
| 276 | calendar_time.year = tm->tm_year + 1900; | ||
| 277 | calendar_time.month = tm->tm_mon + 1; | ||
| 278 | calendar_time.day = tm->tm_mday; | ||
| 279 | calendar_time.hour = tm->tm_hour; | ||
| 280 | calendar_time.minute = tm->tm_min; | ||
| 281 | calendar_time.second = tm->tm_sec; | ||
| 282 | clock_snapshot.system_posix_time = time_since_epoch; | ||
| 283 | clock_snapshot.network_posix_time = time_since_epoch; | ||
| 284 | clock_snapshot.system_calendar_time = calendar_time; | ||
| 285 | clock_snapshot.network_calendar_time = calendar_time; | ||
| 286 | |||
| 287 | CalendarAdditionalInfo additional_info{}; | ||
| 288 | PosixToCalendar(time_since_epoch, calendar_time, additional_info, {}); | ||
| 289 | |||
| 290 | clock_snapshot.system_calendar_info = additional_info; | ||
| 291 | clock_snapshot.network_calendar_info = additional_info; | ||
| 292 | |||
| 293 | clock_snapshot.steady_clock_timepoint = steady_clock_time_point; | ||
| 294 | clock_snapshot.location_name = location_name; | ||
| 295 | clock_snapshot.clock_auto_adjustment_enabled = 1; | ||
| 296 | clock_snapshot.ipc_u8 = unknown_u8; | ||
| 297 | IPC::ResponseBuilder rb{ctx, 2}; | ||
| 298 | rb.Push(RESULT_SUCCESS); | ||
| 299 | ctx.WriteBuffer(&clock_snapshot, sizeof(ClockSnapshot)); | ||
| 300 | } | ||
| 301 | |||
| 210 | Module::Interface::Interface(std::shared_ptr<Module> time, const char* name) | 302 | Module::Interface::Interface(std::shared_ptr<Module> time, const char* name) |
| 211 | : ServiceFramework(name), time(std::move(time)) {} | 303 | : ServiceFramework(name), time(std::move(time)) {} |
| 212 | 304 | ||
diff --git a/src/core/hle/service/time/time.h b/src/core/hle/service/time/time.h index 5659ecad3..77871ae07 100644 --- a/src/core/hle/service/time/time.h +++ b/src/core/hle/service/time/time.h | |||
| @@ -5,6 +5,7 @@ | |||
| 5 | #pragma once | 5 | #pragma once |
| 6 | 6 | ||
| 7 | #include <array> | 7 | #include <array> |
| 8 | #include "common/common_funcs.h" | ||
| 8 | #include "core/hle/service/service.h" | 9 | #include "core/hle/service/service.h" |
| 9 | 10 | ||
| 10 | namespace Service::Time { | 11 | namespace Service::Time { |
| @@ -53,6 +54,23 @@ struct SystemClockContext { | |||
| 53 | static_assert(sizeof(SystemClockContext) == 0x20, | 54 | static_assert(sizeof(SystemClockContext) == 0x20, |
| 54 | "SystemClockContext structure has incorrect size"); | 55 | "SystemClockContext structure has incorrect size"); |
| 55 | 56 | ||
| 57 | struct ClockSnapshot { | ||
| 58 | SystemClockContext user_clock_context; | ||
| 59 | SystemClockContext network_clock_context; | ||
| 60 | s64_le system_posix_time; | ||
| 61 | s64_le network_posix_time; | ||
| 62 | CalendarTime system_calendar_time; | ||
| 63 | CalendarTime network_calendar_time; | ||
| 64 | CalendarAdditionalInfo system_calendar_info; | ||
| 65 | CalendarAdditionalInfo network_calendar_info; | ||
| 66 | SteadyClockTimePoint steady_clock_timepoint; | ||
| 67 | LocationName location_name; | ||
| 68 | u8 clock_auto_adjustment_enabled; | ||
| 69 | u8 ipc_u8; | ||
| 70 | INSERT_PADDING_BYTES(2); | ||
| 71 | }; | ||
| 72 | static_assert(sizeof(ClockSnapshot) == 0xd0, "ClockSnapshot is an invalid size"); | ||
| 73 | |||
| 56 | class Module final { | 74 | class Module final { |
| 57 | public: | 75 | public: |
| 58 | class Interface : public ServiceFramework<Interface> { | 76 | class Interface : public ServiceFramework<Interface> { |
| @@ -65,6 +83,7 @@ public: | |||
| 65 | void GetStandardSteadyClock(Kernel::HLERequestContext& ctx); | 83 | void GetStandardSteadyClock(Kernel::HLERequestContext& ctx); |
| 66 | void GetTimeZoneService(Kernel::HLERequestContext& ctx); | 84 | void GetTimeZoneService(Kernel::HLERequestContext& ctx); |
| 67 | void GetStandardLocalSystemClock(Kernel::HLERequestContext& ctx); | 85 | void GetStandardLocalSystemClock(Kernel::HLERequestContext& ctx); |
| 86 | void GetClockSnapshot(Kernel::HLERequestContext& ctx); | ||
| 68 | 87 | ||
| 69 | protected: | 88 | protected: |
| 70 | std::shared_ptr<Module> time; | 89 | std::shared_ptr<Module> time; |