yuzu-emu
/
yuzu
Archived
1
0
Fork 0
Code

service: nfc: Create interface

This commit is contained in:
Narr the Reg 2023-04-14 17:46:20 -06:00 committed by german77
parent d600183583
commit a3fa64fcc4
5 changed files with 104 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

110
src/core/hle/service/nfc/nfc.cpp
View File

@ -8,12 +8,83 @@
#include "core/hle/service/ipc_helpers.h" #include "core/hle/service/ipc_helpers.h"
#include "core/hle/service/nfc/mifare_user.h" #include "core/hle/service/nfc/mifare_user.h"
#include "core/hle/service/nfc/nfc.h" #include "core/hle/service/nfc/nfc.h"
#include "core/hle/service/nfc/nfc_user.h" #include "core/hle/service/nfc/nfc_interface.h"
#include "core/hle/service/server_manager.h" #include "core/hle/service/server_manager.h"
#include "core/hle/service/service.h" #include "core/hle/service/service.h"
namespace Service::NFC { namespace Service::NFC {
class IUser final : public Interface {
public:
explicit IUser(Core::System& system_) : Interface(system_, "IUser") {
// clang-format off
static const FunctionInfo functions[] = {
{0, &Interface::Initialize, "InitializeOld"},
{1, &Interface::Finalize, "FinalizeOld"},
{2, &Interface::GetState, "GetStateOld"},
{3, &Interface::IsNfcEnabled, "IsNfcEnabledOld"},
{400, &Interface::Initialize, "Initialize"},
{401, &Interface::Finalize, "Finalize"},
{402, &Interface::GetState, "GetState"},
{403, &Interface::IsNfcEnabled, "IsNfcEnabled"},
{404, &Interface::ListDevices, "ListDevices"},
{405, &Interface::GetDeviceState, "GetDeviceState"},
{406, &Interface::GetNpadId, "GetNpadId"},
{407, &Interface::AttachAvailabilityChangeEvent, "AttachAvailabilityChangeEvent"},
{408, &Interface::StartDetection, "StartDetection"},
{409, &Interface::StopDetection, "StopDetection"},
{410, &Interface::GetTagInfo, "GetTagInfo"},
{411, &Interface::AttachActivateEvent, "AttachActivateEvent"},
{412, &Interface::AttachDeactivateEvent, "AttachDeactivateEvent"},
{1000, nullptr, "ReadMifare"},
{1001, nullptr, "WriteMifare"},
{1300, &Interface::SendCommandByPassThrough, "SendCommandByPassThrough"},
{1301, nullptr, "KeepPassThroughSession"},
{1302, nullptr, "ReleasePassThroughSession"},
};
// clang-format on
RegisterHandlers(functions);
}
};
class ISystem final : public Interface {
public:
explicit ISystem(Core::System& system_) : Interface{system_, "ISystem"} {
// clang-format off
static const FunctionInfo functions[] = {
{0, &Interface::Initialize, "InitializeOld"},
{1, &Interface::Finalize, "FinalizeOld"},
{2, &Interface::GetState, "GetStateOld"},
{3, &Interface::IsNfcEnabled, "IsNfcEnabledOld"},
{100, nullptr, "SetNfcEnabledOld"},
{400, &Interface::Initialize, "Initialize"},
{401, &Interface::Finalize, "Finalize"},
{402, &Interface::GetState, "GetState"},
{403, &Interface::IsNfcEnabled, "IsNfcEnabled"},
{404, &Interface::ListDevices, "ListDevices"},
{405, &Interface::GetDeviceState, "GetDeviceState"},
{406, &Interface::GetNpadId, "GetNpadId"},
{407, &Interface::AttachAvailabilityChangeEvent, "AttachAvailabilityChangeEvent"},
{408, &Interface::StartDetection, "StartDetection"},
{409, &Interface::StopDetection, "StopDetection"},
{410, &Interface::GetTagInfo, "GetTagInfo"},
{411, &Interface::AttachActivateEvent, "AttachActivateEvent"},
{412, &Interface::AttachDeactivateEvent, "AttachDeactivateEvent"},
{500, nullptr, "SetNfcEnabled"},
{510, nullptr, "OutputTestWave"},
{1000, nullptr, "ReadMifare"},
{1001, nullptr, "WriteMifare"},
{1300, &Interface::SendCommandByPassThrough, "SendCommandByPassThrough"},
{1301, nullptr, "KeepPassThroughSession"},
{1302, nullptr, "ReleasePassThroughSession"},
};
// clang-format on
RegisterHandlers(functions);
}
};
class IAm final : public ServiceFramework<IAm> { class IAm final : public ServiceFramework<IAm> {
public: public:
explicit IAm(Core::System& system_) : ServiceFramework{system_, "NFC::IAm"} { explicit IAm(Core::System& system_) : ServiceFramework{system_, "NFC::IAm"} {
@ -95,43 +166,6 @@ private:
} }
}; };
class ISystem final : public ServiceFramework<ISystem> {
public:
explicit ISystem(Core::System& system_) : ServiceFramework{system_, "ISystem"} {
// clang-format off
static const FunctionInfo functions[] = {
{0, nullptr, "Initialize"},
{1, nullptr, "Finalize"},
{2, nullptr, "GetStateOld"},
{3, nullptr, "IsNfcEnabledOld"},
{100, nullptr, "SetNfcEnabledOld"},
{400, nullptr, "InitializeSystem"},
{401, nullptr, "FinalizeSystem"},
{402, nullptr, "GetState"},
{403, nullptr, "IsNfcEnabled"},
{404, nullptr, "ListDevices"},
{405, nullptr, "GetDeviceState"},
{406, nullptr, "GetNpadId"},
{407, nullptr, "AttachAvailabilityChangeEvent"},
{408, nullptr, "StartDetection"},
{409, nullptr, "StopDetection"},
{410, nullptr, "GetTagInfo"},
{411, nullptr, "AttachActivateEvent"},
{412, nullptr, "AttachDeactivateEvent"},
{500, nullptr, "SetNfcEnabled"},
{510, nullptr, "OutputTestWave"},
{1000, nullptr, "ReadMifare"},
{1001, nullptr, "WriteMifare"},
{1300, nullptr, "SendCommandByPassThrough"},
{1301, nullptr, "KeepPassThroughSession"},
{1302, nullptr, "ReleasePassThroughSession"},
};
// clang-format on
RegisterHandlers(functions);
}
};
class NFC_SYS final : public ServiceFramework<NFC_SYS> { class NFC_SYS final : public ServiceFramework<NFC_SYS> {
public: public:
explicit NFC_SYS(Core::System& system_) : ServiceFramework{system_, "nfc:sys"} { explicit NFC_SYS(Core::System& system_) : ServiceFramework{system_, "nfc:sys"} {

1
src/core/hle/service/nfc/nfc_device.cpp
View File

@ -11,7 +11,6 @@
#include "core/hle/service/ipc_helpers.h" #include "core/hle/service/ipc_helpers.h"
#include "core/hle/service/nfc/nfc_device.h" #include "core/hle/service/nfc/nfc_device.h"
#include "core/hle/service/nfc/nfc_result.h" #include "core/hle/service/nfc/nfc_result.h"
#include "core/hle/service/nfc/nfc_user.h"
namespace Service::NFC { namespace Service::NFC {
NfcDevice::NfcDevice(Core::HID::NpadIdType npad_id_, Core::System& system_, NfcDevice::NfcDevice(Core::HID::NpadIdType npad_id_, Core::System& system_,

66
src/core/hle/service/nfc/nfc_user.cpp → src/core/hle/service/nfc/nfc_interface.cpp
View File

@ -7,41 +7,15 @@
#include "core/hle/kernel/k_event.h" #include "core/hle/kernel/k_event.h"
#include "core/hle/service/ipc_helpers.h" #include "core/hle/service/ipc_helpers.h"
#include "core/hle/service/nfc/nfc_device.h" #include "core/hle/service/nfc/nfc_device.h"
#include "core/hle/service/nfc/nfc_interface.h"
#include "core/hle/service/nfc/nfc_result.h" #include "core/hle/service/nfc/nfc_result.h"
#include "core/hle/service/nfc/nfc_user.h"
#include "core/hle/service/time/clock_types.h" #include "core/hle/service/time/clock_types.h"
namespace Service::NFC { namespace Service::NFC {
IUser::IUser(Core::System& system_) Interface::Interface(Core::System& system_, const char* name)
: ServiceFramework{system_, "NFC::IUser"}, service_context{system_, service_name} { : ServiceFramework{system_, name}, service_context{system_, service_name} {
static const FunctionInfo functions[] = { availability_change_event = service_context.CreateEvent("Interface:AvailabilityChangeEvent");
{0, &IUser::Initialize, "InitializeOld"},
{1, &IUser::Finalize, "FinalizeOld"},
{2, &IUser::GetState, "GetStateOld"},
{3, &IUser::IsNfcEnabled, "IsNfcEnabledOld"},
{400, &IUser::Initialize, "Initialize"},
{401, &IUser::Finalize, "Finalize"},
{402, &IUser::GetState, "GetState"},
{403, &IUser::IsNfcEnabled, "IsNfcEnabled"},
{404, &IUser::ListDevices, "ListDevices"},
{405, &IUser::GetDeviceState, "GetDeviceState"},
{406, &IUser::GetNpadId, "GetNpadId"},
{407, &IUser::AttachAvailabilityChangeEvent, "AttachAvailabilityChangeEvent"},
{408, &IUser::StartDetection, "StartDetection"},
{409, &IUser::StopDetection, "StopDetection"},
{410, &IUser::GetTagInfo, "GetTagInfo"},
{411, &IUser::AttachActivateEvent, "AttachActivateEvent"},
{412, &IUser::AttachDeactivateEvent, "AttachDeactivateEvent"},
{1000, nullptr, "ReadMifare"},
{1001, nullptr, "WriteMifare"},
{1300, &IUser::SendCommandByPassThrough, "SendCommandByPassThrough"},
{1301, nullptr, "KeepPassThroughSession"},
{1302, nullptr, "ReleasePassThroughSession"},
};
RegisterHandlers(functions);
availability_change_event = service_context.CreateEvent("IUser:AvailabilityChangeEvent");
for (u32 device_index = 0; device_index < 10; device_index++) { for (u32 device_index = 0; device_index < 10; device_index++) {
devices[device_index] = devices[device_index] =
@ -50,11 +24,11 @@ IUser::IUser(Core::System& system_)
} }
} }
IUser ::~IUser() { Interface ::~Interface() {
availability_change_event->Close(); availability_change_event->Close();
} }
void IUser::Initialize(HLERequestContext& ctx) { void Interface::Initialize(HLERequestContext& ctx) {
LOG_INFO(Service_NFC, "called"); LOG_INFO(Service_NFC, "called");
state = State::Initialized; state = State::Initialized;
@ -67,7 +41,7 @@ void IUser::Initialize(HLERequestContext& ctx) {
rb.Push(ResultSuccess); rb.Push(ResultSuccess);
} }
void IUser::Finalize(HLERequestContext& ctx) { void Interface::Finalize(HLERequestContext& ctx) {
LOG_INFO(Service_NFC, "called"); LOG_INFO(Service_NFC, "called");
state = State::NonInitialized; state = State::NonInitialized;
@ -80,7 +54,7 @@ void IUser::Finalize(HLERequestContext& ctx) {
rb.Push(ResultSuccess); rb.Push(ResultSuccess);
} }
void IUser::GetState(HLERequestContext& ctx) { void Interface::GetState(HLERequestContext& ctx) {
LOG_DEBUG(Service_NFC, "called"); LOG_DEBUG(Service_NFC, "called");
IPC::ResponseBuilder rb{ctx, 3}; IPC::ResponseBuilder rb{ctx, 3};
@ -88,7 +62,7 @@ void IUser::GetState(HLERequestContext& ctx) {
rb.PushEnum(state); rb.PushEnum(state);
} }
void IUser::IsNfcEnabled(HLERequestContext& ctx) { void Interface::IsNfcEnabled(HLERequestContext& ctx) {
LOG_DEBUG(Service_NFC, "called"); LOG_DEBUG(Service_NFC, "called");
IPC::ResponseBuilder rb{ctx, 3}; IPC::ResponseBuilder rb{ctx, 3};
@ -96,7 +70,7 @@ void IUser::IsNfcEnabled(HLERequestContext& ctx) {
rb.Push(state != State::NonInitialized); rb.Push(state != State::NonInitialized);
} }
void IUser::ListDevices(HLERequestContext& ctx) { void Interface::ListDevices(HLERequestContext& ctx) {
LOG_DEBUG(Service_NFC, "called"); LOG_DEBUG(Service_NFC, "called");
if (state == State::NonInitialized) { if (state == State::NonInitialized) {
@ -142,7 +116,7 @@ void IUser::ListDevices(HLERequestContext& ctx) {
rb.Push(static_cast<s32>(nfp_devices.size())); rb.Push(static_cast<s32>(nfp_devices.size()));
} }
void IUser::GetDeviceState(HLERequestContext& ctx) { void Interface::GetDeviceState(HLERequestContext& ctx) {
IPC::RequestParser rp{ctx}; IPC::RequestParser rp{ctx};
const auto device_handle{rp.Pop<u64>()}; const auto device_handle{rp.Pop<u64>()};
LOG_DEBUG(Service_NFC, "called, device_handle={}", device_handle); LOG_DEBUG(Service_NFC, "called, device_handle={}", device_handle);
@ -160,7 +134,7 @@ void IUser::GetDeviceState(HLERequestContext& ctx) {
rb.PushEnum(device.value()->GetCurrentState()); rb.PushEnum(device.value()->GetCurrentState());
} }
void IUser::GetNpadId(HLERequestContext& ctx) { void Interface::GetNpadId(HLERequestContext& ctx) {
IPC::RequestParser rp{ctx}; IPC::RequestParser rp{ctx};
const auto device_handle{rp.Pop<u64>()}; const auto device_handle{rp.Pop<u64>()};
LOG_DEBUG(Service_NFC, "called, device_handle={}", device_handle); LOG_DEBUG(Service_NFC, "called, device_handle={}", device_handle);
@ -184,7 +158,7 @@ void IUser::GetNpadId(HLERequestContext& ctx) {
rb.PushEnum(device.value()->GetNpadId()); rb.PushEnum(device.value()->GetNpadId());
} }
void IUser::AttachAvailabilityChangeEvent(HLERequestContext& ctx) { void Interface::AttachAvailabilityChangeEvent(HLERequestContext& ctx) {
LOG_INFO(Service_NFC, "called"); LOG_INFO(Service_NFC, "called");
if (state == State::NonInitialized) { if (state == State::NonInitialized) {
@ -198,7 +172,7 @@ void IUser::AttachAvailabilityChangeEvent(HLERequestContext& ctx) {
rb.PushCopyObjects(availability_change_event->GetReadableEvent()); rb.PushCopyObjects(availability_change_event->GetReadableEvent());
} }
void IUser::StartDetection(HLERequestContext& ctx) { void Interface::StartDetection(HLERequestContext& ctx) {
IPC::RequestParser rp{ctx}; IPC::RequestParser rp{ctx};
const auto device_handle{rp.Pop<u64>()}; const auto device_handle{rp.Pop<u64>()};
const auto nfp_protocol{rp.PopEnum<NFP::TagProtocol>()}; const auto nfp_protocol{rp.PopEnum<NFP::TagProtocol>()};
@ -223,7 +197,7 @@ void IUser::StartDetection(HLERequestContext& ctx) {
rb.Push(result); rb.Push(result);
} }
void IUser::StopDetection(HLERequestContext& ctx) { void Interface::StopDetection(HLERequestContext& ctx) {
IPC::RequestParser rp{ctx}; IPC::RequestParser rp{ctx};
const auto device_handle{rp.Pop<u64>()}; const auto device_handle{rp.Pop<u64>()};
LOG_INFO(Service_NFC, "called, device_handle={}", device_handle); LOG_INFO(Service_NFC, "called, device_handle={}", device_handle);
@ -247,7 +221,7 @@ void IUser::StopDetection(HLERequestContext& ctx) {
rb.Push(result); rb.Push(result);
} }
void IUser::GetTagInfo(HLERequestContext& ctx) { void Interface::GetTagInfo(HLERequestContext& ctx) {
IPC::RequestParser rp{ctx}; IPC::RequestParser rp{ctx};
const auto device_handle{rp.Pop<u64>()}; const auto device_handle{rp.Pop<u64>()};
LOG_INFO(Service_NFC, "called, device_handle={}", device_handle); LOG_INFO(Service_NFC, "called, device_handle={}", device_handle);
@ -273,7 +247,7 @@ void IUser::GetTagInfo(HLERequestContext& ctx) {
rb.Push(result); rb.Push(result);
} }
void IUser::AttachActivateEvent(HLERequestContext& ctx) { void Interface::AttachActivateEvent(HLERequestContext& ctx) {
IPC::RequestParser rp{ctx}; IPC::RequestParser rp{ctx};
const auto device_handle{rp.Pop<u64>()}; const auto device_handle{rp.Pop<u64>()};
LOG_DEBUG(Service_NFC, "called, device_handle={}", device_handle); LOG_DEBUG(Service_NFC, "called, device_handle={}", device_handle);
@ -297,7 +271,7 @@ void IUser::AttachActivateEvent(HLERequestContext& ctx) {
rb.PushCopyObjects(device.value()->GetActivateEvent()); rb.PushCopyObjects(device.value()->GetActivateEvent());
} }
void IUser::AttachDeactivateEvent(HLERequestContext& ctx) { void Interface::AttachDeactivateEvent(HLERequestContext& ctx) {
IPC::RequestParser rp{ctx}; IPC::RequestParser rp{ctx};
const auto device_handle{rp.Pop<u64>()}; const auto device_handle{rp.Pop<u64>()};
LOG_DEBUG(Service_NFC, "called, device_handle={}", device_handle); LOG_DEBUG(Service_NFC, "called, device_handle={}", device_handle);
@ -321,7 +295,7 @@ void IUser::AttachDeactivateEvent(HLERequestContext& ctx) {
rb.PushCopyObjects(device.value()->GetDeactivateEvent()); rb.PushCopyObjects(device.value()->GetDeactivateEvent());
} }
void IUser::SendCommandByPassThrough(HLERequestContext& ctx) { void Interface::SendCommandByPassThrough(HLERequestContext& ctx) {
IPC::RequestParser rp{ctx}; IPC::RequestParser rp{ctx};
const auto device_handle{rp.Pop<u64>()}; const auto device_handle{rp.Pop<u64>()};
const auto timeout{rp.PopRaw<Time::Clock::TimeSpanType>()}; const auto timeout{rp.PopRaw<Time::Clock::TimeSpanType>()};
@ -353,7 +327,7 @@ void IUser::SendCommandByPassThrough(HLERequestContext& ctx) {
rb.Push(static_cast<u32>(out_data.size())); rb.Push(static_cast<u32>(out_data.size()));
} }
std::optional<std::shared_ptr<NfcDevice>> IUser::GetNfcDevice(u64 handle) { std::optional<std::shared_ptr<NfcDevice>> Interface::GetNfcDevice(u64 handle) {
for (auto& device : devices) { for (auto& device : devices) {
if (device->GetHandle() == handle) { if (device->GetHandle() == handle) {
return device; return device;

18
src/core/hle/service/nfc/nfc_user.h → src/core/hle/service/nfc/nfc_interface.h
View File

@ -13,16 +13,10 @@
namespace Service::NFC { namespace Service::NFC {
class NfcDevice; class NfcDevice;
class IUser final : public ServiceFramework<IUser> { class Interface : public ServiceFramework<Interface> {
public: public:
explicit IUser(Core::System& system_); explicit Interface(Core::System& system_, const char* name);
~IUser(); ~Interface();
private:
enum class State : u32 {
NonInitialized,
Initialized,
};
void Initialize(HLERequestContext& ctx); void Initialize(HLERequestContext& ctx);
void Finalize(HLERequestContext& ctx); void Finalize(HLERequestContext& ctx);
@ -39,6 +33,12 @@ private:
void AttachDeactivateEvent(HLERequestContext& ctx); void AttachDeactivateEvent(HLERequestContext& ctx);
void SendCommandByPassThrough(HLERequestContext& ctx); void SendCommandByPassThrough(HLERequestContext& ctx);
private:
enum class State : u32 {
NonInitialized,
Initialized,
};
std::optional<std::shared_ptr<NfcDevice>> GetNfcDevice(u64 handle); std::optional<std::shared_ptr<NfcDevice>> GetNfcDevice(u64 handle);
KernelHelpers::ServiceContext service_context; KernelHelpers::ServiceContext service_context;

24
src/core/hle/service/nfp/nfp.cpp
View File

@ -152,16 +152,10 @@ private:
void CreateUserInterface(HLERequestContext& ctx) { void CreateUserInterface(HLERequestContext& ctx) {
LOG_DEBUG(Service_NFP, "called"); LOG_DEBUG(Service_NFP, "called");
if (user_interface == nullptr) {
user_interface = std::make_shared<IUser>(system);
}
IPC::ResponseBuilder rb{ctx, 2, 0, 1}; IPC::ResponseBuilder rb{ctx, 2, 0, 1};
rb.Push(ResultSuccess); rb.Push(ResultSuccess);
rb.PushIpcInterface<IUser>(user_interface); rb.PushIpcInterface<IUser>(system);
} }
std::shared_ptr<IUser> user_interface;
}; };
class ISystemManager final : public ServiceFramework<ISystemManager> { class ISystemManager final : public ServiceFramework<ISystemManager> {
@ -180,16 +174,10 @@ private:
void CreateSystemInterface(HLERequestContext& ctx) { void CreateSystemInterface(HLERequestContext& ctx) {
LOG_DEBUG(Service_NFP, "called"); LOG_DEBUG(Service_NFP, "called");
if (system_interface == nullptr) {
system_interface = std::make_shared<ISystem>(system);
}
IPC::ResponseBuilder rb{ctx, 2, 0, 1}; IPC::ResponseBuilder rb{ctx, 2, 0, 1};
rb.Push(ResultSuccess); rb.Push(ResultSuccess);
rb.PushIpcInterface<ISystem>(system_interface); rb.PushIpcInterface<ISystem>(system);
} }
std::shared_ptr<ISystem> system_interface;
}; };
class IDebugManager final : public ServiceFramework<IDebugManager> { class IDebugManager final : public ServiceFramework<IDebugManager> {
@ -208,16 +196,10 @@ private:
void CreateDebugInterface(HLERequestContext& ctx) { void CreateDebugInterface(HLERequestContext& ctx) {
LOG_DEBUG(Service_NFP, "called"); LOG_DEBUG(Service_NFP, "called");
if (system_interface == nullptr) {
system_interface = std::make_shared<IDebug>(system);
}
IPC::ResponseBuilder rb{ctx, 2, 0, 1}; IPC::ResponseBuilder rb{ctx, 2, 0, 1};
rb.Push(ResultSuccess); rb.Push(ResultSuccess);
rb.PushIpcInterface<IDebug>(system_interface); rb.PushIpcInterface<IDebug>(system);
} }
std::shared_ptr<IDebug> system_interface;
}; };
void LoopProcess(Core::System& system) { void LoopProcess(Core::System& system) {