mirrors/citra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #4688 from FearlessTobi/moar-nfc

Browse source 
nfc: Improve implementation of GetAmiiboConfig
This commit is contained in:
Weiyi Wang 2019-03-14 15:54:59 -04:00 committed by GitHub
commit 9c5dca184c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/core/hle/service/nfc/nfc.cpp
View file

@ -27,6 +27,7 @@ struct AmiiboConfig {
u8 lastwritedate_day; u8 lastwritedate_day;
u16_le write_counter; u16_le write_counter;
std::array<u8, 3> characterID; std::array<u8, 3> characterID;
u8 series;
u16_le amiiboID; u16_le amiiboID;
u8 type; u8 type;
u8 pagex4_byte3; u8 pagex4_byte3;
@ -141,7 +142,14 @@ void Module::Interface::GetAmiiboConfig(Kernel::HLERequestContext& ctx) {
amiibo_config.lastwritedate_year = 2017; amiibo_config.lastwritedate_year = 2017;
amiibo_config.lastwritedate_month = 10; amiibo_config.lastwritedate_month = 10;
amiibo_config.lastwritedate_day = 10; amiibo_config.lastwritedate_day = 10;
// TODO(FearlessTobi): Find the right values for the struct amiibo_config.write_counter = 0x0;
std::memcpy(amiibo_config.characterID.data(), &nfc->amiibo_data.char_id,
sizeof(nfc->amiibo_data.char_id));
amiibo_config.series = nfc->amiibo_data.series;
amiibo_config.amiiboID = nfc->amiibo_data.model_number;
amiibo_config.type = nfc->amiibo_data.figure_type;
amiibo_config.pagex4_byte3 = 0x0;
amiibo_config.appdata_size = 0xD8;
IPC::RequestBuilder rb = rp.MakeBuilder(17, 0); IPC::RequestBuilder rb = rp.MakeBuilder(17, 0);
rb.Push(RESULT_SUCCESS); rb.Push(RESULT_SUCCESS);