CCF_100
/
yuzu-mirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #10795 from german77/foomiibo 

input_common: Add foomiibo support
master
liamwhite 2023-06-16 00:08:30 +07:00 committed by GitHub
parent 9dd52019a9 0c90a0926f
commit 41295ff8fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/input_common/drivers/virtual_amiibo.cpp
Unescape Escape View File

@ -82,6 +82,7 @@ VirtualAmiibo::Info VirtualAmiibo::LoadAmiibo(const std::string& filename) {
switch (nfc_file.GetSize()) { switch (nfc_file.GetSize()) {
case AmiiboSize: case AmiiboSize:
case AmiiboSizeWithoutPassword: case AmiiboSizeWithoutPassword:
case AmiiboSizeWithSignature:
data.resize(AmiiboSize); data.resize(AmiiboSize);
if (nfc_file.Read(data) < AmiiboSizeWithoutPassword) { if (nfc_file.Read(data) < AmiiboSizeWithoutPassword) {
return Info::NotAnAmiibo; return Info::NotAnAmiibo;
@ -109,6 +110,7 @@ VirtualAmiibo::Info VirtualAmiibo::LoadAmiibo(std::span<u8> data) {
switch (data.size_bytes()) { switch (data.size_bytes()) {
case AmiiboSize: case AmiiboSize:
case AmiiboSizeWithoutPassword: case AmiiboSizeWithoutPassword:
case AmiiboSizeWithSignature:
nfc_data.resize(AmiiboSize); nfc_data.resize(AmiiboSize);
break; break;
case MifareSize: case MifareSize:

1
src/input_common/drivers/virtual_amiibo.h
Unescape Escape View File

@ -57,6 +57,7 @@ public:
private: private:
static constexpr std::size_t AmiiboSize = 0x21C; static constexpr std::size_t AmiiboSize = 0x21C;
static constexpr std::size_t AmiiboSizeWithoutPassword = AmiiboSize - 0x8; static constexpr std::size_t AmiiboSizeWithoutPassword = AmiiboSize - 0x8;
static constexpr std::size_t AmiiboSizeWithSignature = AmiiboSize + 0x20;
static constexpr std::size_t MifareSize = 0x400; static constexpr std::size_t MifareSize = 0x400;
std::string file_path{}; std::string file_path{};