mirror of
https://github.com/azahar-emu/azahar.git
synced 2025-04-28 13:47:59 +03:00
Fixed Linux compile failures
This commit is contained in:
parent
5a0ad29bab
commit
f3d0373afb
5 changed files with 13 additions and 10 deletions
|
@ -2315,10 +2315,10 @@ void Module::Interface::GetNumImportTitleContextsImpl(IPC::RequestParser& rp,
|
|||
|
||||
u32 count = 0;
|
||||
for (auto it = am->import_title_contexts.begin(); it != am->import_title_contexts.end(); it++) {
|
||||
if (include_installing &&
|
||||
if ((include_installing &&
|
||||
(it->second.state == ImportTitleContextState::WAITING_FOR_IMPORT ||
|
||||
it->second.state == ImportTitleContextState::RESUMABLE) ||
|
||||
include_finalizing && it->second.state == ImportTitleContextState::WAITING_FOR_COMMIT) {
|
||||
it->second.state == ImportTitleContextState::RESUMABLE)) ||
|
||||
(include_finalizing && it->second.state == ImportTitleContextState::WAITING_FOR_COMMIT)) {
|
||||
count++;
|
||||
}
|
||||
}
|
||||
|
@ -2335,11 +2335,11 @@ void Module::Interface::GetImportTitleContextListImpl(IPC::RequestParser& rp,
|
|||
u32 written = 0;
|
||||
|
||||
for (auto& key_value : am->import_content_contexts) {
|
||||
if (include_installing &&
|
||||
if ((include_installing &&
|
||||
(key_value.second.state == ImportTitleContextState::WAITING_FOR_IMPORT ||
|
||||
key_value.second.state == ImportTitleContextState::RESUMABLE) ||
|
||||
include_finalizing &&
|
||||
key_value.second.state == ImportTitleContextState::WAITING_FOR_COMMIT) {
|
||||
key_value.second.state == ImportTitleContextState::RESUMABLE)) ||
|
||||
(include_finalizing &&
|
||||
key_value.second.state == ImportTitleContextState::WAITING_FOR_COMMIT)) {
|
||||
|
||||
out_buf.Write(&key_value.first, written * sizeof(u64), sizeof(u64));
|
||||
written++;
|
||||
|
|
|
@ -1357,6 +1357,7 @@ void FS_USER::SetUnknown0x80Data(Kernel::HLERequestContext& ctx) {
|
|||
IPC::RequestParser rp(ctx);
|
||||
u64 title_id{rp.Pop<u64>()};
|
||||
|
||||
[[maybe_unused]]
|
||||
std::array<u8, 0x80> unknown_data = rp.PopRaw<std::array<u8, 0x80>>();
|
||||
|
||||
IPC::RequestBuilder rb{rp.MakeBuilder(1, 0)};
|
||||
|
|
|
@ -7,6 +7,7 @@
|
|||
#include <boost/iostreams/stream.hpp>
|
||||
#include "common/common_paths.h"
|
||||
#include "common/file_util.h"
|
||||
#include "common/string_util.h"
|
||||
#include "core/hw/aes/key.h"
|
||||
#include "core/hw/ecc.h"
|
||||
#include "cryptopp/osrng.h"
|
||||
|
@ -209,4 +210,4 @@ const PublicKey& GetRootPublicKey() {
|
|||
return root_public;
|
||||
}
|
||||
|
||||
} // namespace HW::ECC
|
||||
} // namespace HW::ECC
|
||||
|
|
|
@ -12,6 +12,7 @@
|
|||
#include <fmt/format.h>
|
||||
#include "common/common_paths.h"
|
||||
#include "common/file_util.h"
|
||||
#include "common/string_util.h"
|
||||
#include "common/logging/log.h"
|
||||
#include "core/hw/aes/key.h"
|
||||
#include "core/hw/rsa/rsa.h"
|
||||
|
|
|
@ -201,7 +201,7 @@ LocalFriendCodeSeedB& GetLocalFriendCodeSeedB() {
|
|||
return local_friend_code_seed_b;
|
||||
}
|
||||
|
||||
FileSys::Certificate& HW::UniqueData::GetCTCert() {
|
||||
FileSys::Certificate& GetCTCert() {
|
||||
LoadOTP();
|
||||
|
||||
return ct_cert;
|
||||
|
@ -225,4 +225,4 @@ void InvalidateSecureData() {
|
|||
movable.Invalidate();
|
||||
}
|
||||
|
||||
} // namespace HW::UniqueData
|
||||
} // namespace HW::UniqueData
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue