|
@@ -4,7 +4,10 @@
|
|
|
#include <array>
|
|
#include <array>
|
|
|
#include <atomic>
|
|
#include <atomic>
|
|
|
|
|
|
|
|
|
|
+#include "common/fs/file.h"
|
|
|
|
|
+#include "common/fs/path_util.h"
|
|
|
#include "common/logging/log.h"
|
|
#include "common/logging/log.h"
|
|
|
|
|
+#include "common/string_util.h"
|
|
|
#include "core/core.h"
|
|
#include "core/core.h"
|
|
|
#include "core/hid/emulated_controller.h"
|
|
#include "core/hid/emulated_controller.h"
|
|
|
#include "core/hid/hid_core.h"
|
|
#include "core/hid/hid_core.h"
|
|
@@ -12,6 +15,7 @@
|
|
|
#include "core/hle/ipc_helpers.h"
|
|
#include "core/hle/ipc_helpers.h"
|
|
|
#include "core/hle/kernel/k_event.h"
|
|
#include "core/hle/kernel/k_event.h"
|
|
|
#include "core/hle/service/mii/mii_manager.h"
|
|
#include "core/hle/service/mii/mii_manager.h"
|
|
|
|
|
+#include "core/hle/service/nfp/amiibo_crypto.h"
|
|
|
#include "core/hle/service/nfp/nfp.h"
|
|
#include "core/hle/service/nfp/nfp.h"
|
|
|
#include "core/hle/service/nfp/nfp_user.h"
|
|
#include "core/hle/service/nfp/nfp_user.h"
|
|
|
|
|
|
|
@@ -19,12 +23,14 @@ namespace Service::NFP {
|
|
|
namespace ErrCodes {
|
|
namespace ErrCodes {
|
|
|
constexpr Result DeviceNotFound(ErrorModule::NFP, 64);
|
|
constexpr Result DeviceNotFound(ErrorModule::NFP, 64);
|
|
|
constexpr Result WrongDeviceState(ErrorModule::NFP, 73);
|
|
constexpr Result WrongDeviceState(ErrorModule::NFP, 73);
|
|
|
|
|
+constexpr Result NfcDisabled(ErrorModule::NFP, 80);
|
|
|
|
|
+constexpr Result WriteAmiiboFailed(ErrorModule::NFP, 88);
|
|
|
|
|
+constexpr Result TagRemoved(ErrorModule::NFP, 97);
|
|
|
constexpr Result ApplicationAreaIsNotInitialized(ErrorModule::NFP, 128);
|
|
constexpr Result ApplicationAreaIsNotInitialized(ErrorModule::NFP, 128);
|
|
|
|
|
+constexpr Result WrongApplicationAreaId(ErrorModule::NFP, 152);
|
|
|
constexpr Result ApplicationAreaExist(ErrorModule::NFP, 168);
|
|
constexpr Result ApplicationAreaExist(ErrorModule::NFP, 168);
|
|
|
} // namespace ErrCodes
|
|
} // namespace ErrCodes
|
|
|
|
|
|
|
|
-constexpr u32 ApplicationAreaSize = 0xD8;
|
|
|
|
|
-
|
|
|
|
|
IUser::IUser(Module::Interface& nfp_interface_, Core::System& system_)
|
|
IUser::IUser(Module::Interface& nfp_interface_, Core::System& system_)
|
|
|
: ServiceFramework{system_, "NFP::IUser"}, service_context{system_, service_name},
|
|
: ServiceFramework{system_, "NFP::IUser"}, service_context{system_, service_name},
|
|
|
nfp_interface{nfp_interface_} {
|
|
nfp_interface{nfp_interface_} {
|
|
@@ -39,7 +45,7 @@ IUser::IUser(Module::Interface& nfp_interface_, Core::System& system_)
|
|
|
{7, &IUser::OpenApplicationArea, "OpenApplicationArea"},
|
|
{7, &IUser::OpenApplicationArea, "OpenApplicationArea"},
|
|
|
{8, &IUser::GetApplicationArea, "GetApplicationArea"},
|
|
{8, &IUser::GetApplicationArea, "GetApplicationArea"},
|
|
|
{9, &IUser::SetApplicationArea, "SetApplicationArea"},
|
|
{9, &IUser::SetApplicationArea, "SetApplicationArea"},
|
|
|
- {10, nullptr, "Flush"},
|
|
|
|
|
|
|
+ {10, &IUser::Flush, "Flush"},
|
|
|
{11, nullptr, "Restore"},
|
|
{11, nullptr, "Restore"},
|
|
|
{12, &IUser::CreateApplicationArea, "CreateApplicationArea"},
|
|
{12, &IUser::CreateApplicationArea, "CreateApplicationArea"},
|
|
|
{13, &IUser::GetTagInfo, "GetTagInfo"},
|
|
{13, &IUser::GetTagInfo, "GetTagInfo"},
|
|
@@ -53,7 +59,7 @@ IUser::IUser(Module::Interface& nfp_interface_, Core::System& system_)
|
|
|
{21, &IUser::GetNpadId, "GetNpadId"},
|
|
{21, &IUser::GetNpadId, "GetNpadId"},
|
|
|
{22, &IUser::GetApplicationAreaSize, "GetApplicationAreaSize"},
|
|
{22, &IUser::GetApplicationAreaSize, "GetApplicationAreaSize"},
|
|
|
{23, &IUser::AttachAvailabilityChangeEvent, "AttachAvailabilityChangeEvent"},
|
|
{23, &IUser::AttachAvailabilityChangeEvent, "AttachAvailabilityChangeEvent"},
|
|
|
- {24, nullptr, "RecreateApplicationArea"},
|
|
|
|
|
|
|
+ {24, &IUser::RecreateApplicationArea, "RecreateApplicationArea"},
|
|
|
};
|
|
};
|
|
|
RegisterHandlers(functions);
|
|
RegisterHandlers(functions);
|
|
|
|
|
|
|
@@ -87,11 +93,23 @@ void IUser::Finalize(Kernel::HLERequestContext& ctx) {
|
|
|
void IUser::ListDevices(Kernel::HLERequestContext& ctx) {
|
|
void IUser::ListDevices(Kernel::HLERequestContext& ctx) {
|
|
|
LOG_INFO(Service_NFP, "called");
|
|
LOG_INFO(Service_NFP, "called");
|
|
|
|
|
|
|
|
|
|
+ if (state == State::NonInitialized) {
|
|
|
|
|
+ IPC::ResponseBuilder rb{ctx, 2};
|
|
|
|
|
+ rb.Push(ErrCodes::NfcDisabled);
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
std::vector<u64> devices;
|
|
std::vector<u64> devices;
|
|
|
|
|
|
|
|
// TODO(german77): Loop through all interfaces
|
|
// TODO(german77): Loop through all interfaces
|
|
|
devices.push_back(nfp_interface.GetHandle());
|
|
devices.push_back(nfp_interface.GetHandle());
|
|
|
|
|
|
|
|
|
|
+ if (devices.size() == 0) {
|
|
|
|
|
+ IPC::ResponseBuilder rb{ctx, 2};
|
|
|
|
|
+ rb.Push(ErrCodes::DeviceNotFound);
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
ctx.WriteBuffer(devices);
|
|
ctx.WriteBuffer(devices);
|
|
|
|
|
|
|
|
IPC::ResponseBuilder rb{ctx, 3};
|
|
IPC::ResponseBuilder rb{ctx, 3};
|
|
@@ -105,6 +123,12 @@ void IUser::StartDetection(Kernel::HLERequestContext& ctx) {
|
|
|
const auto nfp_protocol{rp.Pop<s32>()};
|
|
const auto nfp_protocol{rp.Pop<s32>()};
|
|
|
LOG_INFO(Service_NFP, "called, device_handle={}, nfp_protocol={}", device_handle, nfp_protocol);
|
|
LOG_INFO(Service_NFP, "called, device_handle={}, nfp_protocol={}", device_handle, nfp_protocol);
|
|
|
|
|
|
|
|
|
|
+ if (state == State::NonInitialized) {
|
|
|
|
|
+ IPC::ResponseBuilder rb{ctx, 2};
|
|
|
|
|
+ rb.Push(ErrCodes::NfcDisabled);
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
// TODO(german77): Loop through all interfaces
|
|
// TODO(german77): Loop through all interfaces
|
|
|
if (device_handle == nfp_interface.GetHandle()) {
|
|
if (device_handle == nfp_interface.GetHandle()) {
|
|
|
const auto result = nfp_interface.StartDetection(nfp_protocol);
|
|
const auto result = nfp_interface.StartDetection(nfp_protocol);
|
|
@@ -124,6 +148,12 @@ void IUser::StopDetection(Kernel::HLERequestContext& ctx) {
|
|
|
const auto device_handle{rp.Pop<u64>()};
|
|
const auto device_handle{rp.Pop<u64>()};
|
|
|
LOG_INFO(Service_NFP, "called, device_handle={}", device_handle);
|
|
LOG_INFO(Service_NFP, "called, device_handle={}", device_handle);
|
|
|
|
|
|
|
|
|
|
+ if (state == State::NonInitialized) {
|
|
|
|
|
+ IPC::ResponseBuilder rb{ctx, 2};
|
|
|
|
|
+ rb.Push(ErrCodes::NfcDisabled);
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
// TODO(german77): Loop through all interfaces
|
|
// TODO(german77): Loop through all interfaces
|
|
|
if (device_handle == nfp_interface.GetHandle()) {
|
|
if (device_handle == nfp_interface.GetHandle()) {
|
|
|
const auto result = nfp_interface.StopDetection();
|
|
const auto result = nfp_interface.StopDetection();
|
|
@@ -146,6 +176,12 @@ void IUser::Mount(Kernel::HLERequestContext& ctx) {
|
|
|
LOG_INFO(Service_NFP, "called, device_handle={}, model_type={}, mount_target={}", device_handle,
|
|
LOG_INFO(Service_NFP, "called, device_handle={}, model_type={}, mount_target={}", device_handle,
|
|
|
model_type, mount_target);
|
|
model_type, mount_target);
|
|
|
|
|
|
|
|
|
|
+ if (state == State::NonInitialized) {
|
|
|
|
|
+ IPC::ResponseBuilder rb{ctx, 2};
|
|
|
|
|
+ rb.Push(ErrCodes::NfcDisabled);
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
// TODO(german77): Loop through all interfaces
|
|
// TODO(german77): Loop through all interfaces
|
|
|
if (device_handle == nfp_interface.GetHandle()) {
|
|
if (device_handle == nfp_interface.GetHandle()) {
|
|
|
const auto result = nfp_interface.Mount();
|
|
const auto result = nfp_interface.Mount();
|
|
@@ -165,6 +201,12 @@ void IUser::Unmount(Kernel::HLERequestContext& ctx) {
|
|
|
const auto device_handle{rp.Pop<u64>()};
|
|
const auto device_handle{rp.Pop<u64>()};
|
|
|
LOG_INFO(Service_NFP, "called, device_handle={}", device_handle);
|
|
LOG_INFO(Service_NFP, "called, device_handle={}", device_handle);
|
|
|
|
|
|
|
|
|
|
+ if (state == State::NonInitialized) {
|
|
|
|
|
+ IPC::ResponseBuilder rb{ctx, 2};
|
|
|
|
|
+ rb.Push(ErrCodes::NfcDisabled);
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
// TODO(german77): Loop through all interfaces
|
|
// TODO(german77): Loop through all interfaces
|
|
|
if (device_handle == nfp_interface.GetHandle()) {
|
|
if (device_handle == nfp_interface.GetHandle()) {
|
|
|
const auto result = nfp_interface.Unmount();
|
|
const auto result = nfp_interface.Unmount();
|
|
@@ -186,6 +228,12 @@ void IUser::OpenApplicationArea(Kernel::HLERequestContext& ctx) {
|
|
|
LOG_WARNING(Service_NFP, "(STUBBED) called, device_handle={}, access_id={}", device_handle,
|
|
LOG_WARNING(Service_NFP, "(STUBBED) called, device_handle={}, access_id={}", device_handle,
|
|
|
access_id);
|
|
access_id);
|
|
|
|
|
|
|
|
|
|
+ if (state == State::NonInitialized) {
|
|
|
|
|
+ IPC::ResponseBuilder rb{ctx, 2};
|
|
|
|
|
+ rb.Push(ErrCodes::NfcDisabled);
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
// TODO(german77): Loop through all interfaces
|
|
// TODO(german77): Loop through all interfaces
|
|
|
if (device_handle == nfp_interface.GetHandle()) {
|
|
if (device_handle == nfp_interface.GetHandle()) {
|
|
|
const auto result = nfp_interface.OpenApplicationArea(access_id);
|
|
const auto result = nfp_interface.OpenApplicationArea(access_id);
|
|
@@ -205,9 +253,15 @@ void IUser::GetApplicationArea(Kernel::HLERequestContext& ctx) {
|
|
|
const auto device_handle{rp.Pop<u64>()};
|
|
const auto device_handle{rp.Pop<u64>()};
|
|
|
LOG_INFO(Service_NFP, "called, device_handle={}", device_handle);
|
|
LOG_INFO(Service_NFP, "called, device_handle={}", device_handle);
|
|
|
|
|
|
|
|
|
|
+ if (state == State::NonInitialized) {
|
|
|
|
|
+ IPC::ResponseBuilder rb{ctx, 2};
|
|
|
|
|
+ rb.Push(ErrCodes::NfcDisabled);
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
// TODO(german77): Loop through all interfaces
|
|
// TODO(german77): Loop through all interfaces
|
|
|
if (device_handle == nfp_interface.GetHandle()) {
|
|
if (device_handle == nfp_interface.GetHandle()) {
|
|
|
- std::vector<u8> data{};
|
|
|
|
|
|
|
+ ApplicationArea data{};
|
|
|
const auto result = nfp_interface.GetApplicationArea(data);
|
|
const auto result = nfp_interface.GetApplicationArea(data);
|
|
|
ctx.WriteBuffer(data);
|
|
ctx.WriteBuffer(data);
|
|
|
IPC::ResponseBuilder rb{ctx, 3};
|
|
IPC::ResponseBuilder rb{ctx, 3};
|
|
@@ -229,6 +283,12 @@ void IUser::SetApplicationArea(Kernel::HLERequestContext& ctx) {
|
|
|
LOG_WARNING(Service_NFP, "(STUBBED) called, device_handle={}, data_size={}", device_handle,
|
|
LOG_WARNING(Service_NFP, "(STUBBED) called, device_handle={}, data_size={}", device_handle,
|
|
|
data.size());
|
|
data.size());
|
|
|
|
|
|
|
|
|
|
+ if (state == State::NonInitialized) {
|
|
|
|
|
+ IPC::ResponseBuilder rb{ctx, 2};
|
|
|
|
|
+ rb.Push(ErrCodes::NfcDisabled);
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
// TODO(german77): Loop through all interfaces
|
|
// TODO(german77): Loop through all interfaces
|
|
|
if (device_handle == nfp_interface.GetHandle()) {
|
|
if (device_handle == nfp_interface.GetHandle()) {
|
|
|
const auto result = nfp_interface.SetApplicationArea(data);
|
|
const auto result = nfp_interface.SetApplicationArea(data);
|
|
@@ -243,6 +303,31 @@ void IUser::SetApplicationArea(Kernel::HLERequestContext& ctx) {
|
|
|
rb.Push(ErrCodes::DeviceNotFound);
|
|
rb.Push(ErrCodes::DeviceNotFound);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+void IUser::Flush(Kernel::HLERequestContext& ctx) {
|
|
|
|
|
+ IPC::RequestParser rp{ctx};
|
|
|
|
|
+ const auto device_handle{rp.Pop<u64>()};
|
|
|
|
|
+ LOG_WARNING(Service_NFP, "(STUBBED) called, device_handle={}", device_handle);
|
|
|
|
|
+
|
|
|
|
|
+ if (state == State::NonInitialized) {
|
|
|
|
|
+ IPC::ResponseBuilder rb{ctx, 2};
|
|
|
|
|
+ rb.Push(ErrCodes::NfcDisabled);
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ // TODO(german77): Loop through all interfaces
|
|
|
|
|
+ if (device_handle == nfp_interface.GetHandle()) {
|
|
|
|
|
+ const auto result = nfp_interface.Flush();
|
|
|
|
|
+ IPC::ResponseBuilder rb{ctx, 2};
|
|
|
|
|
+ rb.Push(result);
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ LOG_ERROR(Service_NFP, "Handle not found, device_handle={}", device_handle);
|
|
|
|
|
+
|
|
|
|
|
+ IPC::ResponseBuilder rb{ctx, 2};
|
|
|
|
|
+ rb.Push(ErrCodes::DeviceNotFound);
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
void IUser::CreateApplicationArea(Kernel::HLERequestContext& ctx) {
|
|
void IUser::CreateApplicationArea(Kernel::HLERequestContext& ctx) {
|
|
|
IPC::RequestParser rp{ctx};
|
|
IPC::RequestParser rp{ctx};
|
|
|
const auto device_handle{rp.Pop<u64>()};
|
|
const auto device_handle{rp.Pop<u64>()};
|
|
@@ -251,6 +336,12 @@ void IUser::CreateApplicationArea(Kernel::HLERequestContext& ctx) {
|
|
|
LOG_WARNING(Service_NFP, "(STUBBED) called, device_handle={}, data_size={}, access_id={}",
|
|
LOG_WARNING(Service_NFP, "(STUBBED) called, device_handle={}, data_size={}, access_id={}",
|
|
|
device_handle, access_id, data.size());
|
|
device_handle, access_id, data.size());
|
|
|
|
|
|
|
|
|
|
+ if (state == State::NonInitialized) {
|
|
|
|
|
+ IPC::ResponseBuilder rb{ctx, 2};
|
|
|
|
|
+ rb.Push(ErrCodes::NfcDisabled);
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
// TODO(german77): Loop through all interfaces
|
|
// TODO(german77): Loop through all interfaces
|
|
|
if (device_handle == nfp_interface.GetHandle()) {
|
|
if (device_handle == nfp_interface.GetHandle()) {
|
|
|
const auto result = nfp_interface.CreateApplicationArea(access_id, data);
|
|
const auto result = nfp_interface.CreateApplicationArea(access_id, data);
|
|
@@ -270,6 +361,12 @@ void IUser::GetTagInfo(Kernel::HLERequestContext& ctx) {
|
|
|
const auto device_handle{rp.Pop<u64>()};
|
|
const auto device_handle{rp.Pop<u64>()};
|
|
|
LOG_INFO(Service_NFP, "called, device_handle={}", device_handle);
|
|
LOG_INFO(Service_NFP, "called, device_handle={}", device_handle);
|
|
|
|
|
|
|
|
|
|
+ if (state == State::NonInitialized) {
|
|
|
|
|
+ IPC::ResponseBuilder rb{ctx, 2};
|
|
|
|
|
+ rb.Push(ErrCodes::NfcDisabled);
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
// TODO(german77): Loop through all interfaces
|
|
// TODO(german77): Loop through all interfaces
|
|
|
if (device_handle == nfp_interface.GetHandle()) {
|
|
if (device_handle == nfp_interface.GetHandle()) {
|
|
|
TagInfo tag_info{};
|
|
TagInfo tag_info{};
|
|
@@ -291,6 +388,12 @@ void IUser::GetRegisterInfo(Kernel::HLERequestContext& ctx) {
|
|
|
const auto device_handle{rp.Pop<u64>()};
|
|
const auto device_handle{rp.Pop<u64>()};
|
|
|
LOG_INFO(Service_NFP, "called, device_handle={}", device_handle);
|
|
LOG_INFO(Service_NFP, "called, device_handle={}", device_handle);
|
|
|
|
|
|
|
|
|
|
+ if (state == State::NonInitialized) {
|
|
|
|
|
+ IPC::ResponseBuilder rb{ctx, 2};
|
|
|
|
|
+ rb.Push(ErrCodes::NfcDisabled);
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
// TODO(german77): Loop through all interfaces
|
|
// TODO(german77): Loop through all interfaces
|
|
|
if (device_handle == nfp_interface.GetHandle()) {
|
|
if (device_handle == nfp_interface.GetHandle()) {
|
|
|
RegisterInfo register_info{};
|
|
RegisterInfo register_info{};
|
|
@@ -312,6 +415,12 @@ void IUser::GetCommonInfo(Kernel::HLERequestContext& ctx) {
|
|
|
const auto device_handle{rp.Pop<u64>()};
|
|
const auto device_handle{rp.Pop<u64>()};
|
|
|
LOG_INFO(Service_NFP, "called, device_handle={}", device_handle);
|
|
LOG_INFO(Service_NFP, "called, device_handle={}", device_handle);
|
|
|
|
|
|
|
|
|
|
+ if (state == State::NonInitialized) {
|
|
|
|
|
+ IPC::ResponseBuilder rb{ctx, 2};
|
|
|
|
|
+ rb.Push(ErrCodes::NfcDisabled);
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
// TODO(german77): Loop through all interfaces
|
|
// TODO(german77): Loop through all interfaces
|
|
|
if (device_handle == nfp_interface.GetHandle()) {
|
|
if (device_handle == nfp_interface.GetHandle()) {
|
|
|
CommonInfo common_info{};
|
|
CommonInfo common_info{};
|
|
@@ -333,6 +442,12 @@ void IUser::GetModelInfo(Kernel::HLERequestContext& ctx) {
|
|
|
const auto device_handle{rp.Pop<u64>()};
|
|
const auto device_handle{rp.Pop<u64>()};
|
|
|
LOG_INFO(Service_NFP, "called, device_handle={}", device_handle);
|
|
LOG_INFO(Service_NFP, "called, device_handle={}", device_handle);
|
|
|
|
|
|
|
|
|
|
+ if (state == State::NonInitialized) {
|
|
|
|
|
+ IPC::ResponseBuilder rb{ctx, 2};
|
|
|
|
|
+ rb.Push(ErrCodes::NfcDisabled);
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
// TODO(german77): Loop through all interfaces
|
|
// TODO(german77): Loop through all interfaces
|
|
|
if (device_handle == nfp_interface.GetHandle()) {
|
|
if (device_handle == nfp_interface.GetHandle()) {
|
|
|
ModelInfo model_info{};
|
|
ModelInfo model_info{};
|
|
@@ -354,6 +469,12 @@ void IUser::AttachActivateEvent(Kernel::HLERequestContext& ctx) {
|
|
|
const auto device_handle{rp.Pop<u64>()};
|
|
const auto device_handle{rp.Pop<u64>()};
|
|
|
LOG_DEBUG(Service_NFP, "called, device_handle={}", device_handle);
|
|
LOG_DEBUG(Service_NFP, "called, device_handle={}", device_handle);
|
|
|
|
|
|
|
|
|
|
+ if (state == State::NonInitialized) {
|
|
|
|
|
+ IPC::ResponseBuilder rb{ctx, 2};
|
|
|
|
|
+ rb.Push(ErrCodes::NfcDisabled);
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
// TODO(german77): Loop through all interfaces
|
|
// TODO(german77): Loop through all interfaces
|
|
|
if (device_handle == nfp_interface.GetHandle()) {
|
|
if (device_handle == nfp_interface.GetHandle()) {
|
|
|
IPC::ResponseBuilder rb{ctx, 2, 1};
|
|
IPC::ResponseBuilder rb{ctx, 2, 1};
|
|
@@ -373,6 +494,12 @@ void IUser::AttachDeactivateEvent(Kernel::HLERequestContext& ctx) {
|
|
|
const auto device_handle{rp.Pop<u64>()};
|
|
const auto device_handle{rp.Pop<u64>()};
|
|
|
LOG_DEBUG(Service_NFP, "called, device_handle={}", device_handle);
|
|
LOG_DEBUG(Service_NFP, "called, device_handle={}", device_handle);
|
|
|
|
|
|
|
|
|
|
+ if (state == State::NonInitialized) {
|
|
|
|
|
+ IPC::ResponseBuilder rb{ctx, 2};
|
|
|
|
|
+ rb.Push(ErrCodes::NfcDisabled);
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
// TODO(german77): Loop through all interfaces
|
|
// TODO(german77): Loop through all interfaces
|
|
|
if (device_handle == nfp_interface.GetHandle()) {
|
|
if (device_handle == nfp_interface.GetHandle()) {
|
|
|
IPC::ResponseBuilder rb{ctx, 2, 1};
|
|
IPC::ResponseBuilder rb{ctx, 2, 1};
|
|
@@ -419,6 +546,12 @@ void IUser::GetNpadId(Kernel::HLERequestContext& ctx) {
|
|
|
const auto device_handle{rp.Pop<u64>()};
|
|
const auto device_handle{rp.Pop<u64>()};
|
|
|
LOG_DEBUG(Service_NFP, "called, device_handle={}", device_handle);
|
|
LOG_DEBUG(Service_NFP, "called, device_handle={}", device_handle);
|
|
|
|
|
|
|
|
|
|
+ if (state == State::NonInitialized) {
|
|
|
|
|
+ IPC::ResponseBuilder rb{ctx, 2};
|
|
|
|
|
+ rb.Push(ErrCodes::NfcDisabled);
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
// TODO(german77): Loop through all interfaces
|
|
// TODO(german77): Loop through all interfaces
|
|
|
if (device_handle == nfp_interface.GetHandle()) {
|
|
if (device_handle == nfp_interface.GetHandle()) {
|
|
|
IPC::ResponseBuilder rb{ctx, 3};
|
|
IPC::ResponseBuilder rb{ctx, 3};
|
|
@@ -442,7 +575,7 @@ void IUser::GetApplicationAreaSize(Kernel::HLERequestContext& ctx) {
|
|
|
if (device_handle == nfp_interface.GetHandle()) {
|
|
if (device_handle == nfp_interface.GetHandle()) {
|
|
|
IPC::ResponseBuilder rb{ctx, 3};
|
|
IPC::ResponseBuilder rb{ctx, 3};
|
|
|
rb.Push(ResultSuccess);
|
|
rb.Push(ResultSuccess);
|
|
|
- rb.Push(ApplicationAreaSize);
|
|
|
|
|
|
|
+ rb.Push(sizeof(ApplicationArea));
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -455,11 +588,45 @@ void IUser::GetApplicationAreaSize(Kernel::HLERequestContext& ctx) {
|
|
|
void IUser::AttachAvailabilityChangeEvent(Kernel::HLERequestContext& ctx) {
|
|
void IUser::AttachAvailabilityChangeEvent(Kernel::HLERequestContext& ctx) {
|
|
|
LOG_DEBUG(Service_NFP, "(STUBBED) called");
|
|
LOG_DEBUG(Service_NFP, "(STUBBED) called");
|
|
|
|
|
|
|
|
|
|
+ if (state == State::NonInitialized) {
|
|
|
|
|
+ IPC::ResponseBuilder rb{ctx, 2};
|
|
|
|
|
+ rb.Push(ErrCodes::NfcDisabled);
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
IPC::ResponseBuilder rb{ctx, 2, 1};
|
|
IPC::ResponseBuilder rb{ctx, 2, 1};
|
|
|
rb.Push(ResultSuccess);
|
|
rb.Push(ResultSuccess);
|
|
|
rb.PushCopyObjects(availability_change_event->GetReadableEvent());
|
|
rb.PushCopyObjects(availability_change_event->GetReadableEvent());
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+void IUser::RecreateApplicationArea(Kernel::HLERequestContext& ctx) {
|
|
|
|
|
+ IPC::RequestParser rp{ctx};
|
|
|
|
|
+ const auto device_handle{rp.Pop<u64>()};
|
|
|
|
|
+ const auto access_id{rp.Pop<u32>()};
|
|
|
|
|
+ const auto data{ctx.ReadBuffer()};
|
|
|
|
|
+ LOG_WARNING(Service_NFP, "(STUBBED) called, device_handle={}, data_size={}, access_id={}",
|
|
|
|
|
+ device_handle, access_id, data.size());
|
|
|
|
|
+
|
|
|
|
|
+ if (state == State::NonInitialized) {
|
|
|
|
|
+ IPC::ResponseBuilder rb{ctx, 2};
|
|
|
|
|
+ rb.Push(ErrCodes::NfcDisabled);
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ // TODO(german77): Loop through all interfaces
|
|
|
|
|
+ if (device_handle == nfp_interface.GetHandle()) {
|
|
|
|
|
+ const auto result = nfp_interface.RecreateApplicationArea(access_id, data);
|
|
|
|
|
+ IPC::ResponseBuilder rb{ctx, 2};
|
|
|
|
|
+ rb.Push(result);
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ LOG_ERROR(Service_NFP, "Handle not found, device_handle={}", device_handle);
|
|
|
|
|
+
|
|
|
|
|
+ IPC::ResponseBuilder rb{ctx, 2};
|
|
|
|
|
+ rb.Push(ErrCodes::DeviceNotFound);
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
Module::Interface::Interface(std::shared_ptr<Module> module_, Core::System& system_,
|
|
Module::Interface::Interface(std::shared_ptr<Module> module_, Core::System& system_,
|
|
|
const char* name)
|
|
const char* name)
|
|
|
: ServiceFramework{system_, name}, module{std::move(module_)},
|
|
: ServiceFramework{system_, name}, module{std::move(module_)},
|
|
@@ -478,36 +645,42 @@ void Module::Interface::CreateUserInterface(Kernel::HLERequestContext& ctx) {
|
|
|
rb.PushIpcInterface<IUser>(*this, system);
|
|
rb.PushIpcInterface<IUser>(*this, system);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-bool Module::Interface::LoadAmiibo(const std::vector<u8>& buffer) {
|
|
|
|
|
- if (device_state != DeviceState::SearchingForTag) {
|
|
|
|
|
- LOG_ERROR(Service_NFP, "Game is not looking for amiibos, current state {}", device_state);
|
|
|
|
|
- return false;
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
- constexpr auto tag_size = sizeof(NTAG215File);
|
|
|
|
|
|
|
+bool Module::Interface::LoadAmiiboFile(const std::string& filename) {
|
|
|
constexpr auto tag_size_without_password = sizeof(NTAG215File) - sizeof(NTAG215Password);
|
|
constexpr auto tag_size_without_password = sizeof(NTAG215File) - sizeof(NTAG215Password);
|
|
|
|
|
+ const Common::FS::IOFile amiibo_file{filename, Common::FS::FileAccessMode::Read,
|
|
|
|
|
+ Common::FS::FileType::BinaryFile};
|
|
|
|
|
|
|
|
- std::vector<u8> amiibo_buffer = buffer;
|
|
|
|
|
|
|
+ if (!amiibo_file.IsOpen()) {
|
|
|
|
|
+ LOG_ERROR(Service_NFP, "Amiibo is already on use");
|
|
|
|
|
+ return false;
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
- if (amiibo_buffer.size() < tag_size_without_password) {
|
|
|
|
|
- LOG_ERROR(Service_NFP, "Wrong file size {}", buffer.size());
|
|
|
|
|
|
|
+ // Workaround for files with missing password data
|
|
|
|
|
+ std::array<u8, sizeof(EncryptedNTAG215File)> buffer{};
|
|
|
|
|
+ if (amiibo_file.Read(buffer) < tag_size_without_password) {
|
|
|
|
|
+ LOG_ERROR(Service_NFP, "Failed to read amiibo file");
|
|
|
return false;
|
|
return false;
|
|
|
}
|
|
}
|
|
|
|
|
+ memcpy(&encrypted_tag_data, buffer.data(), sizeof(EncryptedNTAG215File));
|
|
|
|
|
|
|
|
- // Ensure it has the correct size
|
|
|
|
|
- if (amiibo_buffer.size() != tag_size) {
|
|
|
|
|
- amiibo_buffer.resize(tag_size, 0);
|
|
|
|
|
|
|
+ if (!AmiiboCrypto::IsAmiiboValid(encrypted_tag_data)) {
|
|
|
|
|
+ LOG_INFO(Service_NFP, "Invalid amiibo");
|
|
|
|
|
+ return false;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- LOG_INFO(Service_NFP, "Amiibo detected");
|
|
|
|
|
- std::memcpy(&tag_data, buffer.data(), tag_size);
|
|
|
|
|
|
|
+ file_path = filename;
|
|
|
|
|
+ return true;
|
|
|
|
|
+}
|
|
|
|
|
|
|
|
- if (!IsAmiiboValid()) {
|
|
|
|
|
|
|
+bool Module::Interface::LoadAmiibo(const std::string& filename) {
|
|
|
|
|
+ if (device_state != DeviceState::SearchingForTag) {
|
|
|
|
|
+ LOG_ERROR(Service_NFP, "Game is not looking for amiibos, current state {}", device_state);
|
|
|
return false;
|
|
return false;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- // This value can't be dumped from a tag. Generate it
|
|
|
|
|
- tag_data.password.PWD = GetTagPassword(tag_data.uuid);
|
|
|
|
|
|
|
+ if (!LoadAmiiboFile(filename)) {
|
|
|
|
|
+ return false;
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
device_state = DeviceState::TagFound;
|
|
device_state = DeviceState::TagFound;
|
|
|
activate_event->GetWritableEvent().Signal();
|
|
activate_event->GetWritableEvent().Signal();
|
|
@@ -517,55 +690,13 @@ bool Module::Interface::LoadAmiibo(const std::vector<u8>& buffer) {
|
|
|
void Module::Interface::CloseAmiibo() {
|
|
void Module::Interface::CloseAmiibo() {
|
|
|
LOG_INFO(Service_NFP, "Remove amiibo");
|
|
LOG_INFO(Service_NFP, "Remove amiibo");
|
|
|
device_state = DeviceState::TagRemoved;
|
|
device_state = DeviceState::TagRemoved;
|
|
|
|
|
+ is_data_decoded = false;
|
|
|
is_application_area_initialized = false;
|
|
is_application_area_initialized = false;
|
|
|
- application_area_id = 0;
|
|
|
|
|
- application_area_data.clear();
|
|
|
|
|
|
|
+ encrypted_tag_data = {};
|
|
|
|
|
+ tag_data = {};
|
|
|
deactivate_event->GetWritableEvent().Signal();
|
|
deactivate_event->GetWritableEvent().Signal();
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-bool Module::Interface::IsAmiiboValid() const {
|
|
|
|
|
- const auto& amiibo_data = tag_data.user_memory;
|
|
|
|
|
- LOG_DEBUG(Service_NFP, "uuid_lock=0x{0:x}", tag_data.lock_bytes);
|
|
|
|
|
- LOG_DEBUG(Service_NFP, "compability_container=0x{0:x}", tag_data.compability_container);
|
|
|
|
|
- LOG_DEBUG(Service_NFP, "crypto_init=0x{0:x}", amiibo_data.crypto_init);
|
|
|
|
|
- LOG_DEBUG(Service_NFP, "write_count={}", amiibo_data.write_count);
|
|
|
|
|
-
|
|
|
|
|
- LOG_DEBUG(Service_NFP, "character_id=0x{0:x}", amiibo_data.model_info.character_id);
|
|
|
|
|
- LOG_DEBUG(Service_NFP, "character_variant={}", amiibo_data.model_info.character_variant);
|
|
|
|
|
- LOG_DEBUG(Service_NFP, "amiibo_type={}", amiibo_data.model_info.amiibo_type);
|
|
|
|
|
- LOG_DEBUG(Service_NFP, "model_number=0x{0:x}", amiibo_data.model_info.model_number);
|
|
|
|
|
- LOG_DEBUG(Service_NFP, "series={}", amiibo_data.model_info.series);
|
|
|
|
|
- LOG_DEBUG(Service_NFP, "fixed_value=0x{0:x}", amiibo_data.model_info.fixed);
|
|
|
|
|
-
|
|
|
|
|
- LOG_DEBUG(Service_NFP, "tag_dynamic_lock=0x{0:x}", tag_data.dynamic_lock);
|
|
|
|
|
- LOG_DEBUG(Service_NFP, "tag_CFG0=0x{0:x}", tag_data.CFG0);
|
|
|
|
|
- LOG_DEBUG(Service_NFP, "tag_CFG1=0x{0:x}", tag_data.CFG1);
|
|
|
|
|
-
|
|
|
|
|
- // Check against all know constants on an amiibo binary
|
|
|
|
|
- if (tag_data.lock_bytes != 0xE00F) {
|
|
|
|
|
- return false;
|
|
|
|
|
- }
|
|
|
|
|
- if (tag_data.compability_container != 0xEEFF10F1U) {
|
|
|
|
|
- return false;
|
|
|
|
|
- }
|
|
|
|
|
- if ((amiibo_data.crypto_init & 0xFF) != 0xA5) {
|
|
|
|
|
- return false;
|
|
|
|
|
- }
|
|
|
|
|
- if (amiibo_data.model_info.fixed != 0x02) {
|
|
|
|
|
- return false;
|
|
|
|
|
- }
|
|
|
|
|
- if ((tag_data.dynamic_lock & 0xFFFFFF) != 0x0F0001) {
|
|
|
|
|
- return false;
|
|
|
|
|
- }
|
|
|
|
|
- if (tag_data.CFG0 != 0x04000000U) {
|
|
|
|
|
- return false;
|
|
|
|
|
- }
|
|
|
|
|
- if (tag_data.CFG1 != 0x5F) {
|
|
|
|
|
- return false;
|
|
|
|
|
- }
|
|
|
|
|
- return true;
|
|
|
|
|
-}
|
|
|
|
|
-
|
|
|
|
|
Kernel::KReadableEvent& Module::Interface::GetActivateEvent() const {
|
|
Kernel::KReadableEvent& Module::Interface::GetActivateEvent() const {
|
|
|
return activate_event->GetReadableEvent();
|
|
return activate_event->GetReadableEvent();
|
|
|
}
|
|
}
|
|
@@ -576,13 +707,20 @@ Kernel::KReadableEvent& Module::Interface::GetDeactivateEvent() const {
|
|
|
|
|
|
|
|
void Module::Interface::Initialize() {
|
|
void Module::Interface::Initialize() {
|
|
|
device_state = DeviceState::Initialized;
|
|
device_state = DeviceState::Initialized;
|
|
|
|
|
+ is_data_decoded = false;
|
|
|
|
|
+ is_application_area_initialized = false;
|
|
|
|
|
+ encrypted_tag_data = {};
|
|
|
|
|
+ tag_data = {};
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
void Module::Interface::Finalize() {
|
|
void Module::Interface::Finalize() {
|
|
|
|
|
+ if (device_state == DeviceState::TagMounted) {
|
|
|
|
|
+ Unmount();
|
|
|
|
|
+ }
|
|
|
|
|
+ if (device_state == DeviceState::SearchingForTag || device_state == DeviceState::TagRemoved) {
|
|
|
|
|
+ StopDetection();
|
|
|
|
|
+ }
|
|
|
device_state = DeviceState::Unaviable;
|
|
device_state = DeviceState::Unaviable;
|
|
|
- is_application_area_initialized = false;
|
|
|
|
|
- application_area_id = 0;
|
|
|
|
|
- application_area_data.clear();
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
Result Module::Interface::StartDetection(s32 protocol_) {
|
|
Result Module::Interface::StartDetection(s32 protocol_) {
|
|
@@ -618,42 +756,102 @@ Result Module::Interface::StopDetection() {
|
|
|
return ErrCodes::WrongDeviceState;
|
|
return ErrCodes::WrongDeviceState;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-Result Module::Interface::Mount() {
|
|
|
|
|
- if (device_state == DeviceState::TagFound) {
|
|
|
|
|
- device_state = DeviceState::TagMounted;
|
|
|
|
|
|
|
+Result Module::Interface::Flush() {
|
|
|
|
|
+ // Ignore write command if we can't encrypt the data
|
|
|
|
|
+ if (!is_data_decoded) {
|
|
|
return ResultSuccess;
|
|
return ResultSuccess;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- LOG_ERROR(Service_NFP, "Wrong device state {}", device_state);
|
|
|
|
|
- return ErrCodes::WrongDeviceState;
|
|
|
|
|
|
|
+ constexpr auto tag_size_without_password = sizeof(NTAG215File) - sizeof(NTAG215Password);
|
|
|
|
|
+ EncryptedNTAG215File tmp_encrypted_tag_data{};
|
|
|
|
|
+ const Common::FS::IOFile amiibo_file{file_path, Common::FS::FileAccessMode::ReadWrite,
|
|
|
|
|
+ Common::FS::FileType::BinaryFile};
|
|
|
|
|
+
|
|
|
|
|
+ if (!amiibo_file.IsOpen()) {
|
|
|
|
|
+ LOG_ERROR(Core, "Amiibo is already on use");
|
|
|
|
|
+ return ErrCodes::WriteAmiiboFailed;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ // Workaround for files with missing password data
|
|
|
|
|
+ std::array<u8, sizeof(EncryptedNTAG215File)> buffer{};
|
|
|
|
|
+ if (amiibo_file.Read(buffer) < tag_size_without_password) {
|
|
|
|
|
+ LOG_ERROR(Core, "Failed to read amiibo file");
|
|
|
|
|
+ return ErrCodes::WriteAmiiboFailed;
|
|
|
|
|
+ }
|
|
|
|
|
+ memcpy(&tmp_encrypted_tag_data, buffer.data(), sizeof(EncryptedNTAG215File));
|
|
|
|
|
+
|
|
|
|
|
+ if (!AmiiboCrypto::IsAmiiboValid(tmp_encrypted_tag_data)) {
|
|
|
|
|
+ LOG_INFO(Service_NFP, "Invalid amiibo");
|
|
|
|
|
+ return ErrCodes::WriteAmiiboFailed;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ bool is_uuid_equal = memcmp(tmp_encrypted_tag_data.uuid.data(), tag_data.uuid.data(), 8) == 0;
|
|
|
|
|
+ bool is_character_equal = tmp_encrypted_tag_data.user_memory.model_info.character_id ==
|
|
|
|
|
+ tag_data.model_info.character_id;
|
|
|
|
|
+ if (!is_uuid_equal || !is_character_equal) {
|
|
|
|
|
+ LOG_ERROR(Service_NFP, "Not the same amiibo");
|
|
|
|
|
+ return ErrCodes::WriteAmiiboFailed;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ if (!AmiiboCrypto::EncodeAmiibo(tag_data, encrypted_tag_data)) {
|
|
|
|
|
+ LOG_ERROR(Service_NFP, "Failed to encode data");
|
|
|
|
|
+ return ErrCodes::WriteAmiiboFailed;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ // Return to the start of the file
|
|
|
|
|
+ if (!amiibo_file.Seek(0)) {
|
|
|
|
|
+ LOG_ERROR(Service_NFP, "Error writting to file");
|
|
|
|
|
+ return ErrCodes::WriteAmiiboFailed;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ if (!amiibo_file.Write(encrypted_tag_data)) {
|
|
|
|
|
+ LOG_ERROR(Service_NFP, "Error writting to file");
|
|
|
|
|
+ return ErrCodes::WriteAmiiboFailed;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ return ResultSuccess;
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
|
|
+Result Module::Interface::Mount() {
|
|
|
|
|
+ if (device_state != DeviceState::TagFound) {
|
|
|
|
|
+ LOG_ERROR(Service_NFP, "Wrong device state {}", device_state);
|
|
|
|
|
+ return ErrCodes::WrongDeviceState;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ is_data_decoded = AmiiboCrypto::DecodeAmiibo(encrypted_tag_data, tag_data);
|
|
|
|
|
+ LOG_INFO(Service_NFP, "Is amiibo decoded {}", is_data_decoded);
|
|
|
|
|
+
|
|
|
|
|
+ is_application_area_initialized = false;
|
|
|
|
|
+ device_state = DeviceState::TagMounted;
|
|
|
|
|
+ return ResultSuccess;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
Result Module::Interface::Unmount() {
|
|
Result Module::Interface::Unmount() {
|
|
|
- if (device_state == DeviceState::TagMounted) {
|
|
|
|
|
- is_application_area_initialized = false;
|
|
|
|
|
- application_area_id = 0;
|
|
|
|
|
- application_area_data.clear();
|
|
|
|
|
- device_state = DeviceState::TagFound;
|
|
|
|
|
- return ResultSuccess;
|
|
|
|
|
|
|
+ if (device_state != DeviceState::TagMounted) {
|
|
|
|
|
+ LOG_ERROR(Service_NFP, "Wrong device state {}", device_state);
|
|
|
|
|
+ return ErrCodes::WrongDeviceState;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- LOG_ERROR(Service_NFP, "Wrong device state {}", device_state);
|
|
|
|
|
- return ErrCodes::WrongDeviceState;
|
|
|
|
|
|
|
+ is_data_decoded = false;
|
|
|
|
|
+ is_application_area_initialized = false;
|
|
|
|
|
+ device_state = DeviceState::TagFound;
|
|
|
|
|
+ return ResultSuccess;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
Result Module::Interface::GetTagInfo(TagInfo& tag_info) const {
|
|
Result Module::Interface::GetTagInfo(TagInfo& tag_info) const {
|
|
|
- if (device_state == DeviceState::TagFound || device_state == DeviceState::TagMounted) {
|
|
|
|
|
- tag_info = {
|
|
|
|
|
- .uuid = tag_data.uuid,
|
|
|
|
|
- .uuid_length = static_cast<u8>(tag_data.uuid.size()),
|
|
|
|
|
- .protocol = protocol,
|
|
|
|
|
- .tag_type = static_cast<u32>(tag_data.user_memory.model_info.amiibo_type),
|
|
|
|
|
- };
|
|
|
|
|
- return ResultSuccess;
|
|
|
|
|
|
|
+ if (device_state != DeviceState::TagFound && device_state != DeviceState::TagMounted) {
|
|
|
|
|
+ LOG_ERROR(Service_NFP, "Wrong device state {}", device_state);
|
|
|
|
|
+ return ErrCodes::WrongDeviceState;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- LOG_ERROR(Service_NFP, "Wrong device state {}", device_state);
|
|
|
|
|
- return ErrCodes::WrongDeviceState;
|
|
|
|
|
|
|
+ tag_info = {
|
|
|
|
|
+ .uuid = encrypted_tag_data.uuid,
|
|
|
|
|
+ .uuid_length = static_cast<u8>(encrypted_tag_data.uuid.size()),
|
|
|
|
|
+ .protocol = protocol,
|
|
|
|
|
+ .tag_type = static_cast<u32>(encrypted_tag_data.user_memory.model_info.amiibo_type),
|
|
|
|
|
+ };
|
|
|
|
|
+
|
|
|
|
|
+ return ResultSuccess;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
Result Module::Interface::GetCommonInfo(CommonInfo& common_info) const {
|
|
Result Module::Interface::GetCommonInfo(CommonInfo& common_info) const {
|
|
@@ -662,14 +860,28 @@ Result Module::Interface::GetCommonInfo(CommonInfo& common_info) const {
|
|
|
return ErrCodes::WrongDeviceState;
|
|
return ErrCodes::WrongDeviceState;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- // Read this data from the amiibo save file
|
|
|
|
|
|
|
+ if (is_data_decoded && tag_data.settings.settings.amiibo_initialized != 0) {
|
|
|
|
|
+ const auto& settings = tag_data.settings;
|
|
|
|
|
+ // TODO: Validate this data
|
|
|
|
|
+ common_info = {
|
|
|
|
|
+ .last_write_year = settings.write_date.GetYear(),
|
|
|
|
|
+ .last_write_month = settings.write_date.GetMonth(),
|
|
|
|
|
+ .last_write_day = settings.write_date.GetDay(),
|
|
|
|
|
+ .write_counter = settings.crc_counter,
|
|
|
|
|
+ .version = 1,
|
|
|
|
|
+ .application_area_size = sizeof(ApplicationArea),
|
|
|
|
|
+ };
|
|
|
|
|
+ return ResultSuccess;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ // Generate a generic answer
|
|
|
common_info = {
|
|
common_info = {
|
|
|
.last_write_year = 2022,
|
|
.last_write_year = 2022,
|
|
|
.last_write_month = 2,
|
|
.last_write_month = 2,
|
|
|
.last_write_day = 7,
|
|
.last_write_day = 7,
|
|
|
- .write_counter = tag_data.user_memory.write_count,
|
|
|
|
|
|
|
+ .write_counter = 0,
|
|
|
.version = 1,
|
|
.version = 1,
|
|
|
- .application_area_size = ApplicationAreaSize,
|
|
|
|
|
|
|
+ .application_area_size = sizeof(ApplicationArea),
|
|
|
};
|
|
};
|
|
|
return ResultSuccess;
|
|
return ResultSuccess;
|
|
|
}
|
|
}
|
|
@@ -680,26 +892,53 @@ Result Module::Interface::GetModelInfo(ModelInfo& model_info) const {
|
|
|
return ErrCodes::WrongDeviceState;
|
|
return ErrCodes::WrongDeviceState;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- model_info = tag_data.user_memory.model_info;
|
|
|
|
|
|
|
+ const auto& model_info_data = encrypted_tag_data.user_memory.model_info;
|
|
|
|
|
+ model_info = {
|
|
|
|
|
+ .character_id = model_info_data.character_id,
|
|
|
|
|
+ .character_variant = model_info_data.character_variant,
|
|
|
|
|
+ .amiibo_type = model_info_data.amiibo_type,
|
|
|
|
|
+ .model_number = model_info_data.model_number,
|
|
|
|
|
+ .series = model_info_data.series,
|
|
|
|
|
+ .constant_value = model_info_data.constant_value,
|
|
|
|
|
+ };
|
|
|
return ResultSuccess;
|
|
return ResultSuccess;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
Result Module::Interface::GetRegisterInfo(RegisterInfo& register_info) const {
|
|
Result Module::Interface::GetRegisterInfo(RegisterInfo& register_info) const {
|
|
|
if (device_state != DeviceState::TagMounted) {
|
|
if (device_state != DeviceState::TagMounted) {
|
|
|
LOG_ERROR(Service_NFP, "Wrong device state {}", device_state);
|
|
LOG_ERROR(Service_NFP, "Wrong device state {}", device_state);
|
|
|
|
|
+ if (device_state == DeviceState::TagRemoved) {
|
|
|
|
|
+ return ErrCodes::TagRemoved;
|
|
|
|
|
+ }
|
|
|
return ErrCodes::WrongDeviceState;
|
|
return ErrCodes::WrongDeviceState;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
Service::Mii::MiiManager manager;
|
|
Service::Mii::MiiManager manager;
|
|
|
|
|
|
|
|
- // Read this data from the amiibo save file
|
|
|
|
|
|
|
+ if (is_data_decoded && tag_data.settings.settings.amiibo_initialized != 0) {
|
|
|
|
|
+ const auto& settings = tag_data.settings;
|
|
|
|
|
+
|
|
|
|
|
+ // TODO: Validate this data
|
|
|
|
|
+ register_info = {
|
|
|
|
|
+ .mii_char_info = manager.ConvertV3ToCharInfo(tag_data.owner_mii),
|
|
|
|
|
+ .first_write_year = settings.init_date.GetYear(),
|
|
|
|
|
+ .first_write_month = settings.init_date.GetMonth(),
|
|
|
|
|
+ .first_write_day = settings.init_date.GetDay(),
|
|
|
|
|
+ .amiibo_name = GetAmiiboName(settings),
|
|
|
|
|
+ .font_region = {},
|
|
|
|
|
+ };
|
|
|
|
|
+
|
|
|
|
|
+ return ResultSuccess;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ // Generate a generic answer
|
|
|
register_info = {
|
|
register_info = {
|
|
|
.mii_char_info = manager.BuildDefault(0),
|
|
.mii_char_info = manager.BuildDefault(0),
|
|
|
.first_write_year = 2022,
|
|
.first_write_year = 2022,
|
|
|
.first_write_month = 2,
|
|
.first_write_month = 2,
|
|
|
.first_write_day = 7,
|
|
.first_write_day = 7,
|
|
|
.amiibo_name = {'Y', 'u', 'z', 'u', 'A', 'm', 'i', 'i', 'b', 'o', 0},
|
|
.amiibo_name = {'Y', 'u', 'z', 'u', 'A', 'm', 'i', 'i', 'b', 'o', 0},
|
|
|
- .unknown = {},
|
|
|
|
|
|
|
+ .font_region = {},
|
|
|
};
|
|
};
|
|
|
return ResultSuccess;
|
|
return ResultSuccess;
|
|
|
}
|
|
}
|
|
@@ -707,31 +946,47 @@ Result Module::Interface::GetRegisterInfo(RegisterInfo& register_info) const {
|
|
|
Result Module::Interface::OpenApplicationArea(u32 access_id) {
|
|
Result Module::Interface::OpenApplicationArea(u32 access_id) {
|
|
|
if (device_state != DeviceState::TagMounted) {
|
|
if (device_state != DeviceState::TagMounted) {
|
|
|
LOG_ERROR(Service_NFP, "Wrong device state {}", device_state);
|
|
LOG_ERROR(Service_NFP, "Wrong device state {}", device_state);
|
|
|
|
|
+ if (device_state == DeviceState::TagRemoved) {
|
|
|
|
|
+ return ErrCodes::TagRemoved;
|
|
|
|
|
+ }
|
|
|
return ErrCodes::WrongDeviceState;
|
|
return ErrCodes::WrongDeviceState;
|
|
|
}
|
|
}
|
|
|
- if (AmiiboApplicationDataExist(access_id)) {
|
|
|
|
|
- application_area_data = LoadAmiiboApplicationData(access_id);
|
|
|
|
|
- application_area_id = access_id;
|
|
|
|
|
- is_application_area_initialized = true;
|
|
|
|
|
|
|
+
|
|
|
|
|
+ // Fallback for lack of amiibo keys
|
|
|
|
|
+ if (!is_data_decoded) {
|
|
|
|
|
+ LOG_WARNING(Service_NFP, "Application area is not initialized");
|
|
|
|
|
+ return ErrCodes::ApplicationAreaIsNotInitialized;
|
|
|
}
|
|
}
|
|
|
- if (!is_application_area_initialized) {
|
|
|
|
|
|
|
+
|
|
|
|
|
+ if (tag_data.settings.settings.appdata_initialized == 0) {
|
|
|
LOG_WARNING(Service_NFP, "Application area is not initialized");
|
|
LOG_WARNING(Service_NFP, "Application area is not initialized");
|
|
|
return ErrCodes::ApplicationAreaIsNotInitialized;
|
|
return ErrCodes::ApplicationAreaIsNotInitialized;
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
|
|
+ if (tag_data.application_area_id != access_id) {
|
|
|
|
|
+ LOG_WARNING(Service_NFP, "Wrong application area id");
|
|
|
|
|
+ return ErrCodes::WrongApplicationAreaId;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ is_application_area_initialized = true;
|
|
|
return ResultSuccess;
|
|
return ResultSuccess;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-Result Module::Interface::GetApplicationArea(std::vector<u8>& data) const {
|
|
|
|
|
|
|
+Result Module::Interface::GetApplicationArea(ApplicationArea& data) const {
|
|
|
if (device_state != DeviceState::TagMounted) {
|
|
if (device_state != DeviceState::TagMounted) {
|
|
|
LOG_ERROR(Service_NFP, "Wrong device state {}", device_state);
|
|
LOG_ERROR(Service_NFP, "Wrong device state {}", device_state);
|
|
|
|
|
+ if (device_state == DeviceState::TagRemoved) {
|
|
|
|
|
+ return ErrCodes::TagRemoved;
|
|
|
|
|
+ }
|
|
|
return ErrCodes::WrongDeviceState;
|
|
return ErrCodes::WrongDeviceState;
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
if (!is_application_area_initialized) {
|
|
if (!is_application_area_initialized) {
|
|
|
LOG_ERROR(Service_NFP, "Application area is not initialized");
|
|
LOG_ERROR(Service_NFP, "Application area is not initialized");
|
|
|
return ErrCodes::ApplicationAreaIsNotInitialized;
|
|
return ErrCodes::ApplicationAreaIsNotInitialized;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- data = application_area_data;
|
|
|
|
|
|
|
+ data = tag_data.application_area;
|
|
|
|
|
|
|
|
return ResultSuccess;
|
|
return ResultSuccess;
|
|
|
}
|
|
}
|
|
@@ -739,46 +994,69 @@ Result Module::Interface::GetApplicationArea(std::vector<u8>& data) const {
|
|
|
Result Module::Interface::SetApplicationArea(const std::vector<u8>& data) {
|
|
Result Module::Interface::SetApplicationArea(const std::vector<u8>& data) {
|
|
|
if (device_state != DeviceState::TagMounted) {
|
|
if (device_state != DeviceState::TagMounted) {
|
|
|
LOG_ERROR(Service_NFP, "Wrong device state {}", device_state);
|
|
LOG_ERROR(Service_NFP, "Wrong device state {}", device_state);
|
|
|
|
|
+ if (device_state == DeviceState::TagRemoved) {
|
|
|
|
|
+ return ErrCodes::TagRemoved;
|
|
|
|
|
+ }
|
|
|
return ErrCodes::WrongDeviceState;
|
|
return ErrCodes::WrongDeviceState;
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
if (!is_application_area_initialized) {
|
|
if (!is_application_area_initialized) {
|
|
|
LOG_ERROR(Service_NFP, "Application area is not initialized");
|
|
LOG_ERROR(Service_NFP, "Application area is not initialized");
|
|
|
return ErrCodes::ApplicationAreaIsNotInitialized;
|
|
return ErrCodes::ApplicationAreaIsNotInitialized;
|
|
|
}
|
|
}
|
|
|
- application_area_data = data;
|
|
|
|
|
- SaveAmiiboApplicationData(application_area_id, application_area_data);
|
|
|
|
|
|
|
+
|
|
|
|
|
+ if (data.size() != sizeof(ApplicationArea)) {
|
|
|
|
|
+ LOG_ERROR(Service_NFP, "Wrong data size {}", data.size());
|
|
|
|
|
+ return ResultUnknown;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ std::memcpy(&tag_data.application_area, data.data(), sizeof(ApplicationArea));
|
|
|
return ResultSuccess;
|
|
return ResultSuccess;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
Result Module::Interface::CreateApplicationArea(u32 access_id, const std::vector<u8>& data) {
|
|
Result Module::Interface::CreateApplicationArea(u32 access_id, const std::vector<u8>& data) {
|
|
|
if (device_state != DeviceState::TagMounted) {
|
|
if (device_state != DeviceState::TagMounted) {
|
|
|
LOG_ERROR(Service_NFP, "Wrong device state {}", device_state);
|
|
LOG_ERROR(Service_NFP, "Wrong device state {}", device_state);
|
|
|
|
|
+ if (device_state == DeviceState::TagRemoved) {
|
|
|
|
|
+ return ErrCodes::TagRemoved;
|
|
|
|
|
+ }
|
|
|
return ErrCodes::WrongDeviceState;
|
|
return ErrCodes::WrongDeviceState;
|
|
|
}
|
|
}
|
|
|
- if (AmiiboApplicationDataExist(access_id)) {
|
|
|
|
|
|
|
+
|
|
|
|
|
+ if (tag_data.settings.settings.appdata_initialized != 0) {
|
|
|
LOG_ERROR(Service_NFP, "Application area already exist");
|
|
LOG_ERROR(Service_NFP, "Application area already exist");
|
|
|
return ErrCodes::ApplicationAreaExist;
|
|
return ErrCodes::ApplicationAreaExist;
|
|
|
}
|
|
}
|
|
|
- application_area_data = data;
|
|
|
|
|
- application_area_id = access_id;
|
|
|
|
|
- SaveAmiiboApplicationData(application_area_id, application_area_data);
|
|
|
|
|
|
|
+
|
|
|
|
|
+ if (data.size() != sizeof(ApplicationArea)) {
|
|
|
|
|
+ LOG_ERROR(Service_NFP, "Wrong data size {}", data.size());
|
|
|
|
|
+ return ResultUnknown;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ std::memcpy(&tag_data.application_area, data.data(), sizeof(ApplicationArea));
|
|
|
|
|
+ tag_data.application_area_id = access_id;
|
|
|
|
|
+
|
|
|
return ResultSuccess;
|
|
return ResultSuccess;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-bool Module::Interface::AmiiboApplicationDataExist(u32 access_id) const {
|
|
|
|
|
- // TODO(german77): Check if file exist
|
|
|
|
|
- return false;
|
|
|
|
|
-}
|
|
|
|
|
|
|
+Result Module::Interface::RecreateApplicationArea(u32 access_id, const std::vector<u8>& data) {
|
|
|
|
|
+ if (device_state != DeviceState::TagMounted) {
|
|
|
|
|
+ LOG_ERROR(Service_NFP, "Wrong device state {}", device_state);
|
|
|
|
|
+ if (device_state == DeviceState::TagRemoved) {
|
|
|
|
|
+ return ErrCodes::TagRemoved;
|
|
|
|
|
+ }
|
|
|
|
|
+ return ErrCodes::WrongDeviceState;
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
-std::vector<u8> Module::Interface::LoadAmiiboApplicationData(u32 access_id) const {
|
|
|
|
|
- // TODO(german77): Read file
|
|
|
|
|
- std::vector<u8> data(ApplicationAreaSize);
|
|
|
|
|
- return data;
|
|
|
|
|
-}
|
|
|
|
|
|
|
+ if (data.size() != sizeof(ApplicationArea)) {
|
|
|
|
|
+ LOG_ERROR(Service_NFP, "Wrong data size {}", data.size());
|
|
|
|
|
+ return ResultUnknown;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ std::memcpy(&tag_data.application_area, data.data(), sizeof(ApplicationArea));
|
|
|
|
|
+ tag_data.application_area_id = access_id;
|
|
|
|
|
|
|
|
-void Module::Interface::SaveAmiiboApplicationData(u32 access_id,
|
|
|
|
|
- const std::vector<u8>& data) const {
|
|
|
|
|
- // TODO(german77): Save file
|
|
|
|
|
|
|
+ return ResultSuccess;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
u64 Module::Interface::GetHandle() const {
|
|
u64 Module::Interface::GetHandle() const {
|
|
@@ -791,16 +1069,25 @@ DeviceState Module::Interface::GetCurrentState() const {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
Core::HID::NpadIdType Module::Interface::GetNpadId() const {
|
|
Core::HID::NpadIdType Module::Interface::GetNpadId() const {
|
|
|
- return npad_id;
|
|
|
|
|
|
|
+ // Return first connected npad id as a workaround for lack of a single nfc interface per
|
|
|
|
|
+ // controller
|
|
|
|
|
+ return system.HIDCore().GetFirstNpadId();
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-u32 Module::Interface::GetTagPassword(const TagUuid& uuid) const {
|
|
|
|
|
- // Verifiy that the generated password is correct
|
|
|
|
|
- u32 password = 0xAA ^ (uuid[1] ^ uuid[3]);
|
|
|
|
|
- password &= (0x55 ^ (uuid[2] ^ uuid[4])) << 8;
|
|
|
|
|
- password &= (0xAA ^ (uuid[3] ^ uuid[5])) << 16;
|
|
|
|
|
- password &= (0x55 ^ (uuid[4] ^ uuid[6])) << 24;
|
|
|
|
|
- return password;
|
|
|
|
|
|
|
+AmiiboName Module::Interface::GetAmiiboName(const AmiiboSettings& settings) const {
|
|
|
|
|
+ std::array<char16_t, amiibo_name_length> settings_amiibo_name{};
|
|
|
|
|
+ AmiiboName amiibo_name{};
|
|
|
|
|
+
|
|
|
|
|
+ // Convert from big endian to little endian
|
|
|
|
|
+ for (std::size_t i = 0; i < amiibo_name_length; i++) {
|
|
|
|
|
+ settings_amiibo_name[i] = static_cast<u16>(settings.amiibo_name[i]);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ // Convert from utf16 to utf8
|
|
|
|
|
+ const auto amiibo_name_utf8 = Common::UTF16ToUTF8(settings_amiibo_name.data());
|
|
|
|
|
+ memcpy(amiibo_name.data(), amiibo_name_utf8.data(), amiibo_name_utf8.size());
|
|
|
|
|
+
|
|
|
|
|
+ return amiibo_name;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
void InstallInterfaces(SM::ServiceManager& service_manager, Core::System& system) {
|
|
void InstallInterfaces(SM::ServiceManager& service_manager, Core::System& system) {
|