mirror of
				https://git.zaroz.cloud/nintendo-back-up/yuzu/yuzu-mainline.git
				synced 2025-03-21 01:53:15 +00:00 
			
		
		
		
	Added ToPosixTime & ToPosixTimeWithMyRule
Added instead of using a seperate PR to prevent conflicts
This commit is contained in:
		
							parent
							
								
									84c6134264
								
							
						
					
					
						commit
						ddc242dd51
					
				@ -35,6 +35,20 @@ static void PosixToCalendar(u64 posix_time, CalendarTime& calendar_time,
 | 
				
			|||||||
    additional_info.utc_offset = 0;
 | 
					    additional_info.utc_offset = 0;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					u64 CalendarToPosix(const CalendarTime& calendar_time, const TimeZoneRule& /*rule*/) {
 | 
				
			||||||
 | 
					    std::tm time{};
 | 
				
			||||||
 | 
					    time.tm_year = calendar_time.year - 1900;
 | 
				
			||||||
 | 
					    time.tm_mon = calendar_time.month - 1;
 | 
				
			||||||
 | 
					    time.tm_mday = calendar_time.day;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    time.tm_hour = calendar_time.hour;
 | 
				
			||||||
 | 
					    time.tm_min = calendar_time.minute;
 | 
				
			||||||
 | 
					    time.tm_sec = calendar_time.second;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    std::time_t epoch_time = std::mktime(&time);
 | 
				
			||||||
 | 
					    return static_cast<u64>(epoch_time);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class ISystemClock final : public ServiceFramework<ISystemClock> {
 | 
					class ISystemClock final : public ServiceFramework<ISystemClock> {
 | 
				
			||||||
public:
 | 
					public:
 | 
				
			||||||
    ISystemClock() : ServiceFramework("ISystemClock") {
 | 
					    ISystemClock() : ServiceFramework("ISystemClock") {
 | 
				
			||||||
@ -100,8 +114,8 @@ public:
 | 
				
			|||||||
            {5, nullptr, "GetTimeZoneRuleVersion"},
 | 
					            {5, nullptr, "GetTimeZoneRuleVersion"},
 | 
				
			||||||
            {100, &ITimeZoneService::ToCalendarTime, "ToCalendarTime"},
 | 
					            {100, &ITimeZoneService::ToCalendarTime, "ToCalendarTime"},
 | 
				
			||||||
            {101, &ITimeZoneService::ToCalendarTimeWithMyRule, "ToCalendarTimeWithMyRule"},
 | 
					            {101, &ITimeZoneService::ToCalendarTimeWithMyRule, "ToCalendarTimeWithMyRule"},
 | 
				
			||||||
            {201, nullptr, "ToPosixTime"},
 | 
					            {201, &ITimeZoneService::ToPosixTime, "ToPosixTime"},
 | 
				
			||||||
            {202, nullptr, "ToPosixTimeWithMyRule"},
 | 
					            {202, &ITimeZoneService::ToPosixTimeWithMyRule, "ToPosixTimeWithMyRule"},
 | 
				
			||||||
        };
 | 
					        };
 | 
				
			||||||
        RegisterHandlers(functions);
 | 
					        RegisterHandlers(functions);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
@ -170,6 +184,31 @@ private:
 | 
				
			|||||||
        rb.PushRaw(calendar_time);
 | 
					        rb.PushRaw(calendar_time);
 | 
				
			||||||
        rb.PushRaw(additional_info);
 | 
					        rb.PushRaw(additional_info);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    void ToPosixTime(Kernel::HLERequestContext& ctx) {
 | 
				
			||||||
 | 
					        // TODO(ogniK): Figure out how to handle multiple times
 | 
				
			||||||
 | 
					        LOG_WARNING(Service_Time, "(STUBBED) called");
 | 
				
			||||||
 | 
					        IPC::RequestParser rp{ctx};
 | 
				
			||||||
 | 
					        auto calendar_time = rp.PopRaw<CalendarTime>();
 | 
				
			||||||
 | 
					        auto posix_time = CalendarToPosix(calendar_time, {});
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        IPC::ResponseBuilder rb{ctx, 3};
 | 
				
			||||||
 | 
					        rb.Push(RESULT_SUCCESS);
 | 
				
			||||||
 | 
					        rb.PushRaw<u32>(1); // Amount of times we're returning
 | 
				
			||||||
 | 
					        ctx.WriteBuffer(&posix_time, sizeof(u64));
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    void ToPosixTimeWithMyRule(Kernel::HLERequestContext& ctx) {
 | 
				
			||||||
 | 
					        LOG_WARNING(Service_Time, "(STUBBED) called");
 | 
				
			||||||
 | 
					        IPC::RequestParser rp{ctx};
 | 
				
			||||||
 | 
					        auto calendar_time = rp.PopRaw<CalendarTime>();
 | 
				
			||||||
 | 
					        auto posix_time = CalendarToPosix(calendar_time, {});
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        IPC::ResponseBuilder rb{ctx, 3};
 | 
				
			||||||
 | 
					        rb.Push(RESULT_SUCCESS);
 | 
				
			||||||
 | 
					        rb.PushRaw<u32>(1); // Amount of times we're returning
 | 
				
			||||||
 | 
					        ctx.WriteBuffer(&posix_time, sizeof(u64));
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void Module::Interface::GetStandardUserSystemClock(Kernel::HLERequestContext& ctx) {
 | 
					void Module::Interface::GetStandardUserSystemClock(Kernel::HLERequestContext& ctx) {
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user