summaryrefslogtreecommitdiffstats
path: root/src/core/hle/service/nfc
diff options
context:
space:
mode:
authorKelebek1 <eeeedddccc@hotmail.co.uk>2024-01-26 16:29:04 +0100
committerKelebek1 <eeeedddccc@hotmail.co.uk>2024-01-27 04:30:09 +0100
commitda410506a401abc853ee23e56ca1e25eb47cd6e6 (patch)
tree6a42e537b6bfbdb460e7f542e4731fc5cad40dd8 /src/core/hle/service/nfc
parentMerge pull request #12808 from t895/uri-moment (diff)
downloadyuzu-da410506a401abc853ee23e56ca1e25eb47cd6e6.tar
yuzu-da410506a401abc853ee23e56ca1e25eb47cd6e6.tar.gz
yuzu-da410506a401abc853ee23e56ca1e25eb47cd6e6.tar.bz2
yuzu-da410506a401abc853ee23e56ca1e25eb47cd6e6.tar.lz
yuzu-da410506a401abc853ee23e56ca1e25eb47cd6e6.tar.xz
yuzu-da410506a401abc853ee23e56ca1e25eb47cd6e6.tar.zst
yuzu-da410506a401abc853ee23e56ca1e25eb47cd6e6.zip
Diffstat (limited to 'src/core/hle/service/nfc')
-rw-r--r--src/core/hle/service/nfc/common/device.cpp8
-rw-r--r--src/core/hle/service/nfc/common/device_manager.cpp8
2 files changed, 8 insertions, 8 deletions
diff --git a/src/core/hle/service/nfc/common/device.cpp b/src/core/hle/service/nfc/common/device.cpp
index 1e2d2d212..28e3000bd 100644
--- a/src/core/hle/service/nfc/common/device.cpp
+++ b/src/core/hle/service/nfc/common/device.cpp
@@ -1405,7 +1405,7 @@ NFP::AmiiboDate NfcDevice::GetAmiiboDate(s64 posix_time) const {
system.ServiceManager().GetService<Service::Glue::Time::StaticService>("time:u", true);
std::shared_ptr<Service::Glue::Time::TimeZoneService> timezone_service{};
- static_service->GetTimeZoneService(timezone_service);
+ static_service->GetTimeZoneService(&timezone_service);
Service::PSC::Time::CalendarTime calendar_time{};
Service::PSC::Time::CalendarAdditionalInfo additional_info{};
@@ -1416,7 +1416,7 @@ NFP::AmiiboDate NfcDevice::GetAmiiboDate(s64 posix_time) const {
amiibo_date.SetMonth(1);
amiibo_date.SetDay(1);
- if (timezone_service->ToCalendarTimeWithMyRule(calendar_time, additional_info, posix_time) ==
+ if (timezone_service->ToCalendarTimeWithMyRule(&calendar_time, &additional_info, posix_time) ==
ResultSuccess) {
amiibo_date.SetYear(calendar_time.year);
amiibo_date.SetMonth(calendar_time.month);
@@ -1431,10 +1431,10 @@ s64 NfcDevice::GetCurrentPosixTime() const {
system.ServiceManager().GetService<Service::Glue::Time::StaticService>("time:u", true);
std::shared_ptr<Service::PSC::Time::SteadyClock> steady_clock{};
- static_service->GetStandardSteadyClock(steady_clock);
+ static_service->GetStandardSteadyClock(&steady_clock);
Service::PSC::Time::SteadyClockTimePoint time_point{};
- R_ASSERT(steady_clock->GetCurrentTimePoint(time_point));
+ R_ASSERT(steady_clock->GetCurrentTimePoint(&time_point));
return time_point.time_point;
}
diff --git a/src/core/hle/service/nfc/common/device_manager.cpp b/src/core/hle/service/nfc/common/device_manager.cpp
index b60699c45..94a8243b5 100644
--- a/src/core/hle/service/nfc/common/device_manager.cpp
+++ b/src/core/hle/service/nfc/common/device_manager.cpp
@@ -91,10 +91,10 @@ Result DeviceManager::ListDevices(std::vector<u64>& nfp_devices, std::size_t max
true);
std::shared_ptr<Service::PSC::Time::SteadyClock> steady_clock{};
- static_service->GetStandardSteadyClock(steady_clock);
+ static_service->GetStandardSteadyClock(&steady_clock);
Service::PSC::Time::SteadyClockTimePoint time_point{};
- R_ASSERT(steady_clock->GetCurrentTimePoint(time_point));
+ R_ASSERT(steady_clock->GetCurrentTimePoint(&time_point));
const s64 elapsed_time = time_point.time_point - time_since_last_error;
if (time_since_last_error != 0 && elapsed_time < MinimumRecoveryTime) {
@@ -754,10 +754,10 @@ Result DeviceManager::VerifyDeviceResult(std::shared_ptr<NfcDevice> device,
system.ServiceManager().GetService<Service::Glue::Time::StaticService>("time:u", true);
std::shared_ptr<Service::PSC::Time::SteadyClock> steady_clock{};
- static_service->GetStandardSteadyClock(steady_clock);
+ static_service->GetStandardSteadyClock(&steady_clock);
Service::PSC::Time::SteadyClockTimePoint time_point{};
- R_ASSERT(steady_clock->GetCurrentTimePoint(time_point));
+ R_ASSERT(steady_clock->GetCurrentTimePoint(&time_point));
time_since_last_error = time_point.time_point;
}