CCF_100
/
suyu-mirror
mirror of https://git.suyu.dev/suyu/suyu
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1146 from lioncash/am 

am: Utilize std::array within PopLaunchParameter()
merge-requests/60/head
bunnei 2018-08-21 18:00:06 +07:00 committed by GitHub
parent 16b83fac9b 8dd9cb98ce
commit c2695aa2eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/core/hle/service/am/am.cpp
Unescape Escape View File

@ -2,6 +2,7 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include <array>
#include <cinttypes> #include <cinttypes>
#include <stack> #include <stack>
#include "core/core.h" #include "core/core.h"
@ -625,16 +626,16 @@ IApplicationFunctions::IApplicationFunctions() : ServiceFramework("IApplicationF
} }
void IApplicationFunctions::PopLaunchParameter(Kernel::HLERequestContext& ctx) { void IApplicationFunctions::PopLaunchParameter(Kernel::HLERequestContext& ctx) {
constexpr u8 data[0x88] = { constexpr std::array<u8, 0x88> data{{
0xca, 0x97, 0x94, 0xc7, // Magic 0xca, 0x97, 0x94, 0xc7, // Magic
1, 0, 0, 0, // IsAccountSelected (bool) 1, 0, 0, 0, // IsAccountSelected (bool)
1, 0, 0, 0, // User Id (word 0) 1, 0, 0, 0, // User Id (word 0)
0, 0, 0, 0, // User Id (word 1) 0, 0, 0, 0, // User Id (word 1)
0, 0, 0, 0, // User Id (word 2) 0, 0, 0, 0, // User Id (word 2)
0, 0, 0, 0 // User Id (word 3) 0, 0, 0, 0 // User Id (word 3)
}; }};
std::vector<u8> buffer(data, data + sizeof(data)); std::vector<u8> buffer(data.begin(), data.end());
IPC::ResponseBuilder rb{ctx, 2, 0, 1}; IPC::ResponseBuilder rb{ctx, 2, 0, 1};