From 9ed82a280e8f22dbd119b4b7becd3582b50f3ffa Mon Sep 17 00:00:00 2001
From: Kelebek1 <eeeedddccc@hotmail.co.uk>
Date: Tue, 30 Jan 2024 19:08:47 +0000
Subject: Remove a few hacks for clock setups, which seem to no longer be
 needed, but fix network clock to local clock on every boot. Also fix some
 logging strings.

---
 src/core/hle/service/glue/time/time_zone.cpp | 27 +++++++++++----------------
 src/core/hle/service/glue/time/time_zone.h   |  6 ++----
 2 files changed, 13 insertions(+), 20 deletions(-)

(limited to 'src/core/hle/service/glue')

diff --git a/src/core/hle/service/glue/time/time_zone.cpp b/src/core/hle/service/glue/time/time_zone.cpp
index 5dc1187cb..98d928697 100644
--- a/src/core/hle/service/glue/time/time_zone.cpp
+++ b/src/core/hle/service/glue/time/time_zone.cpp
@@ -197,32 +197,27 @@ Result TimeZoneService::ToCalendarTimeWithMyRule(
 
 Result TimeZoneService::ToPosixTime(Out<u32> out_count,
                                     OutArray<s64, BufferAttr_HipcPointer> out_times,
-                                    Out<u32> out_times_count,
-                                    Service::PSC::Time::CalendarTime& calendar_time, InRule rule) {
+                                    const Service::PSC::Time::CalendarTime& calendar_time,
+                                    InRule rule) {
     SCOPE_EXIT({
         LOG_DEBUG(Service_Time,
-                  "called. calendar_time={} out_count={} out_times[0]={} out_times[1]={} "
-                  "out_times_count={}",
-                  calendar_time, *out_count, out_times[0], out_times[1], *out_times_count);
+                  "called. calendar_time={} out_count={} out_times[0]={} out_times[1]={}",
+                  calendar_time, *out_count, out_times[0], out_times[1]);
     });
 
-    R_RETURN(
-        m_wrapped_service->ToPosixTime(out_count, out_times, out_times_count, calendar_time, rule));
+    R_RETURN(m_wrapped_service->ToPosixTime(out_count, out_times, calendar_time, rule));
 }
 
-Result TimeZoneService::ToPosixTimeWithMyRule(Out<u32> out_count,
-                                              OutArray<s64, BufferAttr_HipcPointer> out_times,
-                                              Out<u32> out_times_count,
-                                              Service::PSC::Time::CalendarTime& calendar_time) {
+Result TimeZoneService::ToPosixTimeWithMyRule(
+    Out<u32> out_count, OutArray<s64, BufferAttr_HipcPointer> out_times,
+    const Service::PSC::Time::CalendarTime& calendar_time) {
     SCOPE_EXIT({
         LOG_DEBUG(Service_Time,
-                  "called. calendar_time={} out_count={} out_times[0]={} out_times[1]={} "
-                  "out_times_count={}",
-                  calendar_time, *out_count, out_times[0], out_times[1], *out_times_count);
+                  "called. calendar_time={} out_count={} out_times[0]={} out_times[1]={}",
+                  calendar_time, *out_count, out_times[0], out_times[1]);
     });
 
-    R_RETURN(m_wrapped_service->ToPosixTimeWithMyRule(out_count, out_times, out_times_count,
-                                                      calendar_time));
+    R_RETURN(m_wrapped_service->ToPosixTimeWithMyRule(out_count, out_times, calendar_time));
 }
 
 } // namespace Service::Glue::Time
diff --git a/src/core/hle/service/glue/time/time_zone.h b/src/core/hle/service/glue/time/time_zone.h
index bf12adbdc..9c1530966 100644
--- a/src/core/hle/service/glue/time/time_zone.h
+++ b/src/core/hle/service/glue/time/time_zone.h
@@ -68,12 +68,10 @@ public:
         Out<Service::PSC::Time::CalendarTime> out_calendar_time,
         Out<Service::PSC::Time::CalendarAdditionalInfo> out_additional_info, s64 time);
     Result ToPosixTime(Out<u32> out_count, OutArray<s64, BufferAttr_HipcPointer> out_times,
-                       Out<u32> out_times_count, Service::PSC::Time::CalendarTime& calendar_time,
-                       InRule rule);
+                       const Service::PSC::Time::CalendarTime& calendar_time, InRule rule);
     Result ToPosixTimeWithMyRule(Out<u32> out_count,
                                  OutArray<s64, BufferAttr_HipcPointer> out_times,
-                                 Out<u32> out_times_count,
-                                 Service::PSC::Time::CalendarTime& calendar_time);
+                                 const Service::PSC::Time::CalendarTime& calendar_time);
 
 private:
     Core::System& m_system;
-- 
cgit v1.2.3