summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2020-09-17 19:34:47 +0200
committerLioncash <mathew1800@gmail.com>2020-09-17 19:35:55 +0200
commitaca36211463f5551a2212e05dbd9dccf83baaef8 (patch)
tree3878aae8cd01a6fdf0f93af564b45f2322b36e6c
parentMerge pull request #4653 from ReinUsesLisp/gc-warns (diff)
downloadyuzu-aca36211463f5551a2212e05dbd9dccf83baaef8.tar
yuzu-aca36211463f5551a2212e05dbd9dccf83baaef8.tar.gz
yuzu-aca36211463f5551a2212e05dbd9dccf83baaef8.tar.bz2
yuzu-aca36211463f5551a2212e05dbd9dccf83baaef8.tar.lz
yuzu-aca36211463f5551a2212e05dbd9dccf83baaef8.tar.xz
yuzu-aca36211463f5551a2212e05dbd9dccf83baaef8.tar.zst
yuzu-aca36211463f5551a2212e05dbd9dccf83baaef8.zip
-rw-r--r--src/core/hle/service/nfp/nfp.cpp23
1 files changed, 13 insertions, 10 deletions
diff --git a/src/core/hle/service/nfp/nfp.cpp b/src/core/hle/service/nfp/nfp.cpp
index 5e2d769a4..a0469ffbd 100644
--- a/src/core/hle/service/nfp/nfp.cpp
+++ b/src/core/hle/service/nfp/nfp.cpp
@@ -2,6 +2,7 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
+#include <array>
#include <atomic>
#include "common/logging/log.h"
@@ -72,10 +73,10 @@ private:
std::array<u8, 10> uuid;
u8 uuid_length; // TODO(ogniK): Figure out if this is actual the uuid length or does it
// mean something else
- INSERT_PADDING_BYTES(0x15);
+ std::array<u8, 0x15> padding_1;
u32_le protocol;
u32_le tag_type;
- INSERT_PADDING_BYTES(0x2c);
+ std::array<u8, 0x2c> padding_2;
};
static_assert(sizeof(TagInfo) == 0x54, "TagInfo is an invalid size");
@@ -213,13 +214,15 @@ private:
LOG_DEBUG(Service_NFP, "called");
IPC::ResponseBuilder rb{ctx, 2};
- auto amiibo = nfp_interface.GetAmiiboBuffer();
- TagInfo tag_info{};
- tag_info.uuid = amiibo.uuid;
- tag_info.uuid_length = static_cast<u8>(tag_info.uuid.size());
-
- tag_info.protocol = 1; // TODO(ogniK): Figure out actual values
- tag_info.tag_type = 2;
+ const auto& amiibo = nfp_interface.GetAmiiboBuffer();
+ const TagInfo tag_info{
+ .uuid = amiibo.uuid,
+ .uuid_length = static_cast<u8>(tag_info.uuid.size()),
+ .padding_1 = {},
+ .protocol = 1, // TODO(ogniK): Figure out actual values
+ .tag_type = 2,
+ .padding_2 = {},
+ };
ctx.WriteBuffer(tag_info);
rb.Push(RESULT_SUCCESS);
}
@@ -236,7 +239,7 @@ private:
LOG_DEBUG(Service_NFP, "called");
IPC::ResponseBuilder rb{ctx, 2};
- auto amiibo = nfp_interface.GetAmiiboBuffer();
+ const auto& amiibo = nfp_interface.GetAmiiboBuffer();
ctx.WriteBuffer(amiibo.model_info);
rb.Push(RESULT_SUCCESS);
}