From d9d566bd3f6cb8fd4f8d3d2d17851e0568ddf946 Mon Sep 17 00:00:00 2001 From: Narr the Reg Date: Wed, 28 Sep 2022 00:47:51 -0500 Subject: service: nfp: Implement mount target and open application area errors, minor fixes --- src/core/hle/service/nfp/nfp_device.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/core/hle/service/nfp/nfp_device.h') diff --git a/src/core/hle/service/nfp/nfp_device.h b/src/core/hle/service/nfp/nfp_device.h index c020506a6..a5b72cf19 100644 --- a/src/core/hle/service/nfp/nfp_device.h +++ b/src/core/hle/service/nfp/nfp_device.h @@ -40,7 +40,7 @@ public: Result StartDetection(s32 protocol_); Result StopDetection(); - Result Mount(); + Result Mount(MountTarget mount_target); Result Unmount(); Result Flush(); @@ -55,7 +55,7 @@ public: Result OpenApplicationArea(u32 access_id); Result GetApplicationArea(std::vector& data) const; - Result SetApplicationArea(const std::vector& data); + Result SetApplicationArea(std::span data); Result CreateApplicationArea(u32 access_id, std::span data); Result RecreateApplicationArea(u32 access_id, std::span data); Result DeleteApplicationArea(); @@ -70,7 +70,7 @@ public: private: void NpadUpdate(Core::HID::ControllerTriggerType type); - bool LoadAmiibo(const std::vector& data); + bool LoadAmiibo(std::span data); void CloseAmiibo(); AmiiboName GetAmiiboName(const AmiiboSettings& settings) const; @@ -88,8 +88,10 @@ private: Kernel::KEvent* availability_change_event = nullptr; bool is_data_moddified{}; + bool is_app_area_open{}; s32 protocol{}; s64 current_posix_time{}; + MountTarget mount_target{MountTarget::None}; DeviceState device_state{DeviceState::Unavailable}; NTAG215File tag_data{}; -- cgit v1.2.3