mirror of
https://git.eden-emu.dev/eden-emu/eden
synced 2026-04-29 08:59:02 +02:00
more fs fixes
This commit is contained in:
parent
7ed7cdbcd6
commit
b5b7e2cf81
5 changed files with 9 additions and 7 deletions
|
|
@ -185,13 +185,13 @@ static_assert(sizeof(SaveDataFilter) == 0x48, "SaveDataFilter has invalid size."
|
||||||
static_assert(std::is_trivially_copyable_v<SaveDataFilter>,
|
static_assert(std::is_trivially_copyable_v<SaveDataFilter>,
|
||||||
"Data type must be trivially copyable.");
|
"Data type must be trivially copyable.");
|
||||||
|
|
||||||
struct HashSalt {
|
struct SaveDataHashSalt {
|
||||||
static constexpr size_t Size = 32;
|
static constexpr size_t Size = 32;
|
||||||
|
|
||||||
std::array<u8, Size> value;
|
std::array<u8, Size> value;
|
||||||
};
|
};
|
||||||
static_assert(std::is_trivially_copyable_v<HashSalt>, "Data type must be trivially copyable.");
|
static_assert(std::is_trivially_copyable_v<SaveDataHashSalt>, "Data type must be trivially copyable.");
|
||||||
static_assert(sizeof(HashSalt) == HashSalt::Size);
|
static_assert(sizeof(SaveDataHashSalt) == SaveDataHashSalt::Size);
|
||||||
|
|
||||||
struct SaveDataCreationInfo2 {
|
struct SaveDataCreationInfo2 {
|
||||||
|
|
||||||
|
|
@ -210,7 +210,7 @@ struct SaveDataCreationInfo2 {
|
||||||
u8 reserved1;
|
u8 reserved1;
|
||||||
bool is_hash_salt_enabled;
|
bool is_hash_salt_enabled;
|
||||||
u8 reserved2;
|
u8 reserved2;
|
||||||
HashSalt hash_salt;
|
SaveDataHashSalt hash_salt;
|
||||||
SaveDataMetaType meta_type;
|
SaveDataMetaType meta_type;
|
||||||
u8 reserved3;
|
u8 reserved3;
|
||||||
s32 meta_size;
|
s32 meta_size;
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@
|
||||||
#include "core/file_sys/vfs/vfs.h"
|
#include "core/file_sys/vfs/vfs.h"
|
||||||
#include "core/file_sys/vfs/vfs_vector.h"
|
#include "core/file_sys/vfs/vfs_vector.h"
|
||||||
|
|
||||||
namespace FileSys {
|
namespace FileSys::RomFSBuilder {
|
||||||
|
|
||||||
constexpr u64 FS_MAX_PATH = 0x301;
|
constexpr u64 FS_MAX_PATH = 0x301;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@
|
||||||
#include "common/common_types.h"
|
#include "common/common_types.h"
|
||||||
#include "core/file_sys/vfs/vfs.h"
|
#include "core/file_sys/vfs/vfs.h"
|
||||||
|
|
||||||
namespace FileSys {
|
namespace FileSys::RomFSBuilder {
|
||||||
|
|
||||||
struct RomFSBuildDirectoryContext;
|
struct RomFSBuildDirectoryContext;
|
||||||
struct RomFSBuildFileContext;
|
struct RomFSBuildFileContext;
|
||||||
|
|
|
||||||
|
|
@ -163,7 +163,7 @@ VirtualFile CreateRomFS(VirtualDir dir, VirtualDir ext) {
|
||||||
if (dir == nullptr)
|
if (dir == nullptr)
|
||||||
return nullptr;
|
return nullptr;
|
||||||
|
|
||||||
RomFSBuildContext ctx{dir, ext};
|
RomFSBuilder::RomFSBuildContext ctx{dir, ext};
|
||||||
return ConcatenatedVfsFile::MakeConcatenatedFile(0, dir->GetName(), ctx.Build());
|
return ConcatenatedVfsFile::MakeConcatenatedFile(0, dir->GetName(), ctx.Build());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,8 @@
|
||||||
// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
|
// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
|
||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
#include "core/hle/result.h"
|
#include "core/hle/result.h"
|
||||||
|
|
||||||
namespace Service::RO {
|
namespace Service::RO {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue