more fs fixes

This commit is contained in:
lizzie 2026-03-18 00:03:10 +00:00 committed by crueter
parent f553731313
commit 65489a8f59
No known key found for this signature in database
GPG key ID: 425ACD2D4830EBC6
5 changed files with 9 additions and 7 deletions

View file

@ -185,13 +185,13 @@ static_assert(sizeof(SaveDataFilter) == 0x48, "SaveDataFilter has invalid size."
static_assert(std::is_trivially_copyable_v<SaveDataFilter>,
"Data type must be trivially copyable.");
struct HashSalt {
struct SaveDataHashSalt {
static constexpr size_t Size = 32;
std::array<u8, Size> value;
};
static_assert(std::is_trivially_copyable_v<HashSalt>, "Data type must be trivially copyable.");
static_assert(sizeof(HashSalt) == HashSalt::Size);
static_assert(std::is_trivially_copyable_v<SaveDataHashSalt>, "Data type must be trivially copyable.");
static_assert(sizeof(SaveDataHashSalt) == SaveDataHashSalt::Size);
struct SaveDataCreationInfo2 {
@ -210,7 +210,7 @@ struct SaveDataCreationInfo2 {
u8 reserved1;
bool is_hash_salt_enabled;
u8 reserved2;
HashSalt hash_salt;
SaveDataHashSalt hash_salt;
SaveDataMetaType meta_type;
u8 reserved3;
s32 meta_size;

View file

@ -11,7 +11,7 @@
#include "core/file_sys/vfs/vfs.h"
#include "core/file_sys/vfs/vfs_vector.h"
namespace FileSys {
namespace FileSys::RomFSBuilder {
constexpr u64 FS_MAX_PATH = 0x301;

View file

@ -9,7 +9,7 @@
#include "common/common_types.h"
#include "core/file_sys/vfs/vfs.h"
namespace FileSys {
namespace FileSys::RomFSBuilder {
struct RomFSBuildDirectoryContext;
struct RomFSBuildFileContext;

View file

@ -163,7 +163,7 @@ VirtualFile CreateRomFS(VirtualDir dir, VirtualDir ext) {
if (dir == nullptr)
return nullptr;
RomFSBuildContext ctx{dir, ext};
RomFSBuilder::RomFSBuildContext ctx{dir, ext};
return ConcatenatedVfsFile::MakeConcatenatedFile(0, dir->GetName(), ctx.Build());
}

View file

@ -1,6 +1,8 @@
// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
#include "core/hle/result.h"
namespace Service::RO {