Exverge/suyu
3
0
Fork 0
forked from suyu/suyu
Code Pull requests Activity

vfs: Move vfs files to their own directory

Browse source
This commit is contained in:
FearlessTobi 2024-01-16 06:23:01 +01:00 committed by Liam
parent 06fb7f90da
commit 0f9288e38d
100 changed files with 183 additions and 160 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

111
src/core/CMakeLists.txt
View file

@ -20,28 +20,49 @@ add_library(core STATIC
cpu_manager.h
crypto/aes_util.cpp
crypto/aes_util.h
crypto/ctr_encryption_layer.cpp
crypto/ctr_encryption_layer.h
crypto/encryption_layer.cpp
crypto/encryption_layer.h
crypto/key_manager.cpp
crypto/key_manager.h
crypto/partition_data_manager.cpp
crypto/partition_data_manager.h
crypto/ctr_encryption_layer.cpp
crypto/ctr_encryption_layer.h
crypto/xts_encryption_layer.cpp
crypto/xts_encryption_layer.h
debugger/debugger_interface.h
debugger/debugger.cpp
debugger/debugger.h
debugger/gdbstub_arch.cpp
debugger/gdbstub_arch.h
debugger/debugger_interface.h
debugger/gdbstub.cpp
debugger/gdbstub.h
debugger/gdbstub_arch.cpp
debugger/gdbstub_arch.h
device_memory_manager.h
device_memory_manager.inc
device_memory.cpp
device_memory.h
file_sys/bis_factory.cpp
file_sys/bis_factory.h
file_sys/card_image.cpp
file_sys/card_image.h
file_sys/common_funcs.h
file_sys/content_archive.cpp
file_sys/content_archive.h
file_sys/control_metadata.cpp
file_sys/control_metadata.h
file_sys/errors.h
file_sys/fs_directory.h
file_sys/fs_file.h
file_sys/fs_filesystem.h
file_sys/fs_memory_management.h
file_sys/fs_operate_range.h
file_sys/fs_path.h
file_sys/fs_path_utility.h
file_sys/fs_util_character_encoding.h
file_sys/fsmitm_romfsbuild.cpp
file_sys/fsmitm_romfsbuild.h
file_sys/fssystem/fs_i_storage.h
file_sys/fssystem/fs_types.h
file_sys/fssystem/fssystem_aes_ctr_counter_extended_storage.cpp
file_sys/fssystem/fssystem_aes_ctr_counter_extended_storage.h
file_sys/fssystem/fssystem_aes_ctr_storage.cpp
@ -146,22 +167,22 @@ add_library(core STATIC
file_sys/system_archive/system_version.h
file_sys/system_archive/time_zone_binary.cpp
file_sys/system_archive/time_zone_binary.h
file_sys/vfs.cpp
file_sys/vfs.h
file_sys/vfs_cached.cpp
file_sys/vfs_cached.h
file_sys/vfs_concat.cpp
file_sys/vfs_concat.h
file_sys/vfs_layered.cpp
file_sys/vfs_layered.h
file_sys/vfs_offset.cpp
file_sys/vfs_offset.h
file_sys/vfs_real.cpp
file_sys/vfs_real.h
file_sys/vfs_static.h
file_sys/vfs_types.h
file_sys/vfs_vector.cpp
file_sys/vfs_vector.h
file_sys/vfs/vfs.cpp
file_sys/vfs/vfs.h
file_sys/vfs/vfs_cached.cpp
file_sys/vfs/vfs_cached.h
file_sys/vfs/vfs_concat.cpp
file_sys/vfs/vfs_concat.h
file_sys/vfs/vfs_layered.cpp
file_sys/vfs/vfs_layered.h
file_sys/vfs/vfs_offset.cpp
file_sys/vfs/vfs_offset.h
file_sys/vfs/vfs_real.cpp
file_sys/vfs/vfs_real.h
file_sys/vfs/vfs_static.h
file_sys/vfs/vfs_types.h
file_sys/vfs/vfs_vector.cpp
file_sys/vfs/vfs_vector.h
file_sys/xts_archive.cpp
file_sys/xts_archive.h
frontend/applets/cabinet.cpp
@ -486,6 +507,8 @@ add_library(core STATIC
hle/service/fatal/fatal_p.h
hle/service/fatal/fatal_u.cpp
hle/service/fatal/fatal_u.h
hle/service/fgm/fgm.cpp
hle/service/fgm/fgm.h
hle/service/filesystem/filesystem.cpp
hle/service/filesystem/filesystem.h
hle/service/filesystem/fsp/fs_i_directory.cpp
@ -560,13 +583,18 @@ add_library(core STATIC
hle/service/hid/irs.h
hle/service/hid/xcd.cpp
hle/service/hid/xcd.h
hle/service/hle_ipc.cpp
hle/service/hle_ipc.h
hle/service/ipc_helpers.h
hle/service/kernel_helpers.cpp
hle/service/kernel_helpers.h
hle/service/lbl/lbl.cpp
hle/service/lbl/lbl.h
hle/service/ldn/lan_discovery.cpp
hle/service/ldn/lan_discovery.h
hle/service/ldn/ldn_results.h
hle/service/ldn/ldn.cpp
hle/service/ldn/ldn.h
hle/service/ldn/ldn_results.h
hle/service/ldn/ldn_types.h
hle/service/ldr/ldr.cpp
hle/service/ldr/ldr.h
@ -574,16 +602,6 @@ add_library(core STATIC
hle/service/lm/lm.h
hle/service/mig/mig.cpp
hle/service/mig/mig.h
hle/service/mii/types/char_info.cpp
hle/service/mii/types/char_info.h
hle/service/mii/types/core_data.cpp
hle/service/mii/types/core_data.h
hle/service/mii/types/raw_data.cpp
hle/service/mii/types/raw_data.h
hle/service/mii/types/store_data.cpp
hle/service/mii/types/store_data.h
hle/service/mii/types/ver3_store_data.cpp
hle/service/mii/types/ver3_store_data.h
hle/service/mii/mii.cpp
hle/service/mii/mii.h
hle/service/mii/mii_database.cpp
@ -595,10 +613,22 @@ add_library(core STATIC
hle/service/mii/mii_result.h
hle/service/mii/mii_types.h
hle/service/mii/mii_util.h
hle/service/mii/types/char_info.cpp
hle/service/mii/types/char_info.h
hle/service/mii/types/core_data.cpp
hle/service/mii/types/core_data.h
hle/service/mii/types/raw_data.cpp
hle/service/mii/types/raw_data.h
hle/service/mii/types/store_data.cpp
hle/service/mii/types/store_data.h
hle/service/mii/types/ver3_store_data.cpp
hle/service/mii/types/ver3_store_data.h
hle/service/mm/mm_u.cpp
hle/service/mm/mm_u.h
hle/service/mnpp/mnpp_app.cpp
hle/service/mnpp/mnpp_app.h
hle/service/mutex.cpp
hle/service/mutex.h
hle/service/ncm/ncm.cpp
hle/service/ncm/ncm.h
hle/service/nfc/common/amiibo_crypto.cpp
@ -768,19 +798,12 @@ add_library(core STATIC
hle/service/ptm/ptm.h
hle/service/ptm/ts.cpp
hle/service/ptm/ts.h
hle/service/hle_ipc.cpp
hle/service/hle_ipc.h
hle/service/ipc_helpers.h
hle/service/kernel_helpers.cpp
hle/service/kernel_helpers.h
hle/service/mutex.cpp
hle/service/mutex.h
hle/service/ro/ro.cpp
hle/service/ro/ro.h
hle/service/ro/ro_nro_utils.cpp
hle/service/ro/ro_nro_utils.h
hle/service/ro/ro_results.h
hle/service/ro/ro_types.h
hle/service/ro/ro.cpp
hle/service/ro/ro.h
hle/service/server_manager.cpp
hle/service/server_manager.h
hle/service/service.cpp
@ -847,9 +870,9 @@ add_library(core STATIC
internal_network/network.h
internal_network/network_interface.cpp
internal_network/network_interface.h
internal_network/sockets.h
internal_network/socket_proxy.cpp
internal_network/socket_proxy.h
internal_network/sockets.h
loader/deconstructed_rom_directory.cpp
loader/deconstructed_rom_directory.h
loader/kip.cpp
@ -868,13 +891,13 @@ add_library(core STATIC
loader/nsp.h
loader/xci.cpp
loader/xci.h
memory.cpp
memory.h
memory/cheat_engine.cpp
memory/cheat_engine.h
memory/dmnt_cheat_types.h
memory/dmnt_cheat_vm.cpp
memory/dmnt_cheat_vm.h
memory.cpp
memory.h
perf_stats.cpp
perf_stats.h
precompiled_headers.h

4
src/core/core.cpp
View file

@ -26,8 +26,8 @@
#include "core/file_sys/registered_cache.h"
#include "core/file_sys/romfs_factory.h"
#include "core/file_sys/savedata_factory.h"
#include "core/file_sys/vfs_concat.h"
#include "core/file_sys/vfs_real.h"
#include "core/file_sys/vfs/vfs_concat.h"
#include "core/file_sys/vfs/vfs_real.h"
#include "core/gpu_dirty_memory_manager.h"
#include "core/hle/kernel/k_memory_manager.h"
#include "core/hle/kernel/k_process.h"

2
src/core/core.h
View file

@ -13,7 +13,7 @@
#include <vector>
#include "common/common_types.h"
#include "core/file_sys/vfs_types.h"
#include "core/file_sys/vfs/vfs_types.h"
namespace Core::Frontend {
class EmuWindow;

2
src/core/crypto/aes_util.h
View file

@ -7,7 +7,7 @@
#include <span>
#include <type_traits>
#include "common/common_types.h"
#include "core/file_sys/vfs.h"
#include "core/file_sys/vfs/vfs.h"
namespace Core::Crypto {

2
src/core/crypto/encryption_layer.h
View file

@ -4,7 +4,7 @@
#pragma once
#include "common/common_types.h"
#include "core/file_sys/vfs.h"
#include "core/file_sys/vfs/vfs.h"
namespace Core::Crypto {

6
src/core/crypto/partition_data_manager.cpp
View file

@ -21,9 +21,9 @@
#include "core/crypto/partition_data_manager.h"
#include "core/crypto/xts_encryption_layer.h"
#include "core/file_sys/kernel_executable.h"
#include "core/file_sys/vfs.h"
#include "core/file_sys/vfs_offset.h"
#include "core/file_sys/vfs_vector.h"
#include "core/file_sys/vfs/vfs.h"
#include "core/file_sys/vfs/vfs_offset.h"
#include "core/file_sys/vfs/vfs_vector.h"
#include "core/loader/loader.h"
using Common::AsArray;

2
src/core/crypto/partition_data_manager.h
View file

@ -5,7 +5,7 @@
#include <vector>
#include "common/common_types.h"
#include "core/file_sys/vfs_types.h"
#include "core/file_sys/vfs/vfs_types.h"
namespace Core::Crypto {

2
src/core/file_sys/bis_factory.cpp
View file

@ -6,7 +6,7 @@
#include "core/file_sys/bis_factory.h"
#include "core/file_sys/mode.h"
#include "core/file_sys/registered_cache.h"
#include "core/file_sys/vfs.h"
#include "core/file_sys/vfs/vfs.h"
namespace FileSys {

2
src/core/file_sys/bis_factory.h
View file

@ -6,7 +6,7 @@
#include <memory>
#include "common/common_types.h"
#include "core/file_sys/vfs_types.h"
#include "core/file_sys/vfs/vfs_types.h"
namespace FileSys {

4
src/core/file_sys/card_image.cpp
View file

@ -13,8 +13,8 @@
#include "core/file_sys/nca_metadata.h"
#include "core/file_sys/partition_filesystem.h"
#include "core/file_sys/submission_package.h"
#include "core/file_sys/vfs_offset.h"
#include "core/file_sys/vfs_vector.h"
#include "core/file_sys/vfs/vfs_offset.h"
#include "core/file_sys/vfs/vfs_vector.h"
#include "core/loader/loader.h"
namespace FileSys {

2
src/core/file_sys/card_image.h
View file

@ -8,7 +8,7 @@
#include <vector>
#include "common/common_types.h"
#include "common/swap.h"
#include "core/file_sys/vfs.h"
#include "core/file_sys/vfs/vfs.h"
namespace Core::Crypto {
class KeyManager;

2
src/core/file_sys/content_archive.cpp
View file

@ -13,7 +13,7 @@
#include "core/crypto/key_manager.h"
#include "core/file_sys/content_archive.h"
#include "core/file_sys/partition_filesystem.h"
#include "core/file_sys/vfs_offset.h"
#include "core/file_sys/vfs/vfs_offset.h"
#include "core/loader/loader.h"
#include "core/file_sys/fssystem/fssystem_compression_configuration.h"

2
src/core/file_sys/content_archive.h
View file

@ -13,7 +13,7 @@
#include "common/common_types.h"
#include "common/swap.h"
#include "core/crypto/key_manager.h"
#include "core/file_sys/vfs.h"
#include "core/file_sys/vfs/vfs.h"
namespace Loader {
enum class ResultStatus : u16;

2
src/core/file_sys/control_metadata.cpp
View file

@ -5,7 +5,7 @@
#include "common/string_util.h"
#include "common/swap.h"
#include "core/file_sys/control_metadata.h"
#include "core/file_sys/vfs.h"
#include "core/file_sys/vfs/vfs.h"
namespace FileSys {

2
src/core/file_sys/control_metadata.h
View file

@ -8,7 +8,7 @@
#include "common/common_funcs.h"
#include "common/common_types.h"
#include "common/swap.h"
#include "core/file_sys/vfs_types.h"
#include "core/file_sys/vfs/vfs_types.h"
namespace FileSys {

4
src/core/file_sys/fsmitm_romfsbuild.cpp
View file

@ -8,8 +8,8 @@
#include "common/assert.h"
#include "core/file_sys/fsmitm_romfsbuild.h"
#include "core/file_sys/ips_layer.h"
#include "core/file_sys/vfs.h"
#include "core/file_sys/vfs_vector.h"
#include "core/file_sys/vfs/vfs.h"
#include "core/file_sys/vfs/vfs_vector.h"
namespace FileSys {

2
src/core/file_sys/fsmitm_romfsbuild.h
View file

@ -7,7 +7,7 @@
#include <memory>
#include <string>
#include "common/common_types.h"
#include "core/file_sys/vfs.h"
#include "core/file_sys/vfs/vfs.h"
namespace FileSys {

2
src/core/file_sys/fssystem/fs_i_storage.h
View file

@ -5,7 +5,7 @@
#include "common/overflow.h"
#include "core/file_sys/errors.h"
#include "core/file_sys/vfs.h"
#include "core/file_sys/vfs/vfs.h"
namespace FileSys {

2
src/core/file_sys/fssystem/fssystem_aes_ctr_counter_extended_storage.cpp
View file

@ -4,7 +4,7 @@
#include "core/file_sys/fssystem/fssystem_aes_ctr_counter_extended_storage.h"
#include "core/file_sys/fssystem/fssystem_aes_ctr_storage.h"
#include "core/file_sys/fssystem/fssystem_nca_header.h"
#include "core/file_sys/vfs_offset.h"
#include "core/file_sys/vfs/vfs_offset.h"
namespace FileSys {

2
src/core/file_sys/fssystem/fssystem_aes_ctr_storage.h
View file

@ -9,7 +9,7 @@
#include "core/crypto/key_manager.h"
#include "core/file_sys/errors.h"
#include "core/file_sys/fssystem/fs_i_storage.h"
#include "core/file_sys/vfs.h"
#include "core/file_sys/vfs/vfs.h"
namespace FileSys {

2
src/core/file_sys/fssystem/fssystem_bucket_tree.h
View file

@ -10,7 +10,7 @@
#include "common/common_types.h"
#include "common/literals.h"
#include "core/file_sys/vfs.h"
#include "core/file_sys/vfs/vfs.h"
#include "core/hle/result.h"
namespace FileSys {

2
src/core/file_sys/fssystem/fssystem_compressed_storage.h
View file

@ -10,7 +10,7 @@
#include "core/file_sys/fssystem/fssystem_bucket_tree.h"
#include "core/file_sys/fssystem/fssystem_compression_common.h"
#include "core/file_sys/fssystem/fssystem_pooled_buffer.h"
#include "core/file_sys/vfs.h"
#include "core/file_sys/vfs/vfs.h"
namespace FileSys {

2
src/core/file_sys/fssystem/fssystem_hierarchical_integrity_verification_storage.cpp
View file

@ -2,7 +2,7 @@
// SPDX-License-Identifier: GPL-2.0-or-later
#include "core/file_sys/fssystem/fssystem_hierarchical_integrity_verification_storage.h"
#include "core/file_sys/vfs_offset.h"
#include "core/file_sys/vfs/vfs_offset.h"
namespace FileSys {

2
src/core/file_sys/fssystem/fssystem_hierarchical_integrity_verification_storage.h
View file

@ -8,7 +8,7 @@
#include "core/file_sys/fssystem/fs_types.h"
#include "core/file_sys/fssystem/fssystem_alignment_matching_storage.h"
#include "core/file_sys/fssystem/fssystem_integrity_verification_storage.h"
#include "core/file_sys/vfs_offset.h"
#include "core/file_sys/vfs/vfs_offset.h"
namespace FileSys {

2
src/core/file_sys/fssystem/fssystem_hierarchical_sha256_storage.h
View file

@ -7,7 +7,7 @@
#include "core/file_sys/errors.h"
#include "core/file_sys/fssystem/fs_i_storage.h"
#include "core/file_sys/vfs.h"
#include "core/file_sys/vfs/vfs.h"
namespace FileSys {

4
src/core/file_sys/fssystem/fssystem_indirect_storage.h
View file

@ -7,8 +7,8 @@
#include "core/file_sys/fssystem/fs_i_storage.h"
#include "core/file_sys/fssystem/fssystem_bucket_tree.h"
#include "core/file_sys/fssystem/fssystem_bucket_tree_template_impl.h"
#include "core/file_sys/vfs.h"
#include "core/file_sys/vfs_offset.h"
#include "core/file_sys/vfs/vfs.h"
#include "core/file_sys/vfs/vfs_offset.h"
namespace FileSys {

2
src/core/file_sys/fssystem/fssystem_integrity_romfs_storage.h
View file

@ -5,7 +5,7 @@
#include "core/file_sys/fssystem/fssystem_hierarchical_integrity_verification_storage.h"
#include "core/file_sys/fssystem/fssystem_nca_header.h"
#include "core/file_sys/vfs_vector.h"
#include "core/file_sys/vfs/vfs_vector.h"
namespace FileSys {

4
src/core/file_sys/fssystem/fssystem_nca_file_system_driver.cpp
View file

@ -14,8 +14,8 @@
#include "core/file_sys/fssystem/fssystem_nca_file_system_driver.h"
#include "core/file_sys/fssystem/fssystem_sparse_storage.h"
#include "core/file_sys/fssystem/fssystem_switch_storage.h"
#include "core/file_sys/vfs_offset.h"
#include "core/file_sys/vfs_vector.h"
#include "core/file_sys/vfs/vfs_offset.h"
#include "core/file_sys/vfs/vfs_vector.h"
namespace FileSys {

2
src/core/file_sys/fssystem/fssystem_nca_file_system_driver.h
View file

@ -5,7 +5,7 @@
#include "core/file_sys/fssystem/fssystem_compression_common.h"
#include "core/file_sys/fssystem/fssystem_nca_header.h"
#include "core/file_sys/vfs.h"
#include "core/file_sys/vfs/vfs.h"
namespace FileSys {

2
src/core/file_sys/fssystem/fssystem_nca_reader.cpp
View file

@ -3,7 +3,7 @@
#include "core/file_sys/fssystem/fssystem_aes_xts_storage.h"
#include "core/file_sys/fssystem/fssystem_nca_file_system_driver.h"
#include "core/file_sys/vfs_offset.h"
#include "core/file_sys/vfs/vfs_offset.h"
namespace FileSys {

2
src/core/file_sys/ips_layer.cpp
View file

@ -12,7 +12,7 @@
#include "common/logging/log.h"
#include "common/swap.h"
#include "core/file_sys/ips_layer.h"
#include "core/file_sys/vfs_vector.h"
#include "core/file_sys/vfs/vfs_vector.h"
namespace FileSys {

2
src/core/file_sys/ips_layer.h
View file

@ -8,7 +8,7 @@
#include <vector>
#include "common/common_types.h"
#include "core/file_sys/vfs.h"
#include "core/file_sys/vfs/vfs.h"
namespace FileSys {

2
src/core/file_sys/kernel_executable.cpp
View file

@ -5,7 +5,7 @@
#include "common/string_util.h"
#include "core/file_sys/kernel_executable.h"
#include "core/file_sys/vfs_offset.h"
#include "core/file_sys/vfs/vfs_offset.h"
#include "core/loader/loader.h"
namespace FileSys {

2
src/core/file_sys/kernel_executable.h
View file

@ -10,7 +10,7 @@
#include "common/common_funcs.h"
#include "common/common_types.h"
#include "common/swap.h"
#include "core/file_sys/vfs_types.h"
#include "core/file_sys/vfs/vfs_types.h"
namespace Loader {
enum class ResultStatus : u16;

2
src/core/file_sys/nca_metadata.cpp
View file

@ -6,7 +6,7 @@
#include "common/logging/log.h"
#include "common/swap.h"
#include "core/file_sys/nca_metadata.h"
#include "core/file_sys/vfs.h"
#include "core/file_sys/vfs/vfs.h"
namespace FileSys {

2
src/core/file_sys/nca_metadata.h
View file

@ -8,7 +8,7 @@
#include "common/common_funcs.h"
#include "common/common_types.h"
#include "common/swap.h"
#include "core/file_sys/vfs_types.h"
#include "core/file_sys/vfs/vfs_types.h"
namespace FileSys {
class CNMT;

2
src/core/file_sys/partition_filesystem.cpp
View file

@ -9,7 +9,7 @@
#include "common/logging/log.h"
#include "core/file_sys/partition_filesystem.h"
#include "core/file_sys/vfs_offset.h"
#include "core/file_sys/vfs/vfs_offset.h"
#include "core/loader/loader.h"
namespace FileSys {

2
src/core/file_sys/partition_filesystem.h
View file

@ -9,7 +9,7 @@
#include "common/common_funcs.h"
#include "common/common_types.h"
#include "common/swap.h"
#include "core/file_sys/vfs.h"
#include "core/file_sys/vfs/vfs.h"
namespace Loader {
enum class ResultStatus : u16;

6
src/core/file_sys/patch_manager.cpp
View file

@ -21,9 +21,9 @@
#include "core/file_sys/patch_manager.h"
#include "core/file_sys/registered_cache.h"
#include "core/file_sys/romfs.h"
#include "core/file_sys/vfs_cached.h"
#include "core/file_sys/vfs_layered.h"
#include "core/file_sys/vfs_vector.h"
#include "core/file_sys/vfs/vfs_cached.h"
#include "core/file_sys/vfs/vfs_layered.h"
#include "core/file_sys/vfs/vfs_vector.h"
#include "core/hle/service/filesystem/filesystem.h"
#include "core/hle/service/ns/language.h"
#include "core/hle/service/set/settings_server.h"

2
src/core/file_sys/patch_manager.h
View file

@ -9,7 +9,7 @@
#include <string>
#include "common/common_types.h"
#include "core/file_sys/nca_metadata.h"
#include "core/file_sys/vfs_types.h"
#include "core/file_sys/vfs/vfs_types.h"
#include "core/memory/dmnt_cheat_types.h"
namespace Core {

2
src/core/file_sys/program_metadata.cpp
View file

@ -7,7 +7,7 @@
#include "common/logging/log.h"
#include "common/scope_exit.h"
#include "core/file_sys/program_metadata.h"
#include "core/file_sys/vfs.h"
#include "core/file_sys/vfs/vfs.h"
#include "core/loader/loader.h"
namespace FileSys {

2
src/core/file_sys/program_metadata.h
View file

@ -10,7 +10,7 @@
#include "common/common_funcs.h"
#include "common/common_types.h"
#include "common/swap.h"
#include "core/file_sys/vfs_types.h"
#include "core/file_sys/vfs/vfs_types.h"
namespace Loader {
enum class ResultStatus : u16;

2
src/core/file_sys/registered_cache.cpp
View file

@ -17,7 +17,7 @@
#include "core/file_sys/nca_metadata.h"
#include "core/file_sys/registered_cache.h"
#include "core/file_sys/submission_package.h"
#include "core/file_sys/vfs_concat.h"
#include "core/file_sys/vfs/vfs_concat.h"
#include "core/loader/loader.h"
namespace FileSys {

2
src/core/file_sys/registered_cache.h
View file

@ -11,7 +11,7 @@
#include <boost/container/flat_map.hpp>
#include "common/common_types.h"
#include "core/crypto/key_manager.h"
#include "core/file_sys/vfs.h"
#include "core/file_sys/vfs/vfs.h"
namespace FileSys {
class CNMT;

10
src/core/file_sys/romfs.cpp
View file

@ -9,11 +9,11 @@
#include "common/swap.h"
#include "core/file_sys/fsmitm_romfsbuild.h"
#include "core/file_sys/romfs.h"
#include "core/file_sys/vfs.h"
#include "core/file_sys/vfs_cached.h"
#include "core/file_sys/vfs_concat.h"
#include "core/file_sys/vfs_offset.h"
#include "core/file_sys/vfs_vector.h"
#include "core/file_sys/vfs/vfs.h"
#include "core/file_sys/vfs/vfs_cached.h"
#include "core/file_sys/vfs/vfs_concat.h"
#include "core/file_sys/vfs/vfs_offset.h"
#include "core/file_sys/vfs/vfs_vector.h"
namespace FileSys {
namespace {

2
src/core/file_sys/romfs.h
View file

@ -3,7 +3,7 @@
#pragma once
#include "core/file_sys/vfs.h"
#include "core/file_sys/vfs/vfs.h"
namespace FileSys {

2
src/core/file_sys/romfs_factory.h
View file

@ -6,7 +6,7 @@
#include <memory>
#include "common/common_types.h"
#include "core/file_sys/vfs_types.h"
#include "core/file_sys/vfs/vfs_types.h"
#include "core/hle/result.h"
namespace Loader {

2
src/core/file_sys/savedata_factory.cpp
View file

@ -8,7 +8,7 @@
#include "common/uuid.h"
#include "core/core.h"
#include "core/file_sys/savedata_factory.h"
#include "core/file_sys/vfs.h"
#include "core/file_sys/vfs/vfs.h"
namespace FileSys {

2
src/core/file_sys/savedata_factory.h
View file

@ -7,7 +7,7 @@
#include <string>
#include "common/common_funcs.h"
#include "common/common_types.h"
#include "core/file_sys/vfs.h"
#include "core/file_sys/vfs/vfs.h"
#include "core/hle/result.h"
namespace Core {

2
src/core/file_sys/sdmc_factory.cpp
View file

@ -4,7 +4,7 @@
#include <memory>
#include "core/file_sys/registered_cache.h"
#include "core/file_sys/sdmc_factory.h"
#include "core/file_sys/vfs.h"
#include "core/file_sys/vfs/vfs.h"
#include "core/file_sys/xts_archive.h"
namespace FileSys {

2
src/core/file_sys/sdmc_factory.h
View file

@ -4,7 +4,7 @@
#pragma once
#include <memory>
#include "core/file_sys/vfs_types.h"
#include "core/file_sys/vfs/vfs_types.h"
#include "core/hle/result.h"
namespace FileSys {

2
src/core/file_sys/submission_package.h
View file

@ -9,7 +9,7 @@
#include <vector>
#include "common/common_types.h"
#include "core/file_sys/nca_metadata.h"
#include "core/file_sys/vfs.h"
#include "core/file_sys/vfs/vfs.h"
namespace Core::Crypto {
class KeyManager;

2
src/core/file_sys/system_archive/mii_model.cpp
View file

@ -2,7 +2,7 @@
// SPDX-License-Identifier: GPL-2.0-or-later
#include "core/file_sys/system_archive/mii_model.h"
#include "core/file_sys/vfs_vector.h"
#include "core/file_sys/vfs/vfs_vector.h"
namespace FileSys::SystemArchive {

2
src/core/file_sys/system_archive/mii_model.h
View file

@ -3,7 +3,7 @@
#pragma once
#include "core/file_sys/vfs_types.h"
#include "core/file_sys/vfs/vfs_types.h"
namespace FileSys::SystemArchive {

2
src/core/file_sys/system_archive/ng_word.cpp
View file

@ -4,7 +4,7 @@
#include <fmt/format.h>
#include "common/common_types.h"
#include "core/file_sys/system_archive/ng_word.h"
#include "core/file_sys/vfs_vector.h"
#include "core/file_sys/vfs/vfs_vector.h"
namespace FileSys::SystemArchive {

2
src/core/file_sys/system_archive/ng_word.h
View file

@ -3,7 +3,7 @@
#pragma once
#include "core/file_sys/vfs_types.h"
#include "core/file_sys/vfs/vfs_types.h"
namespace FileSys::SystemArchive {

2
src/core/file_sys/system_archive/shared_font.cpp
View file

@ -8,7 +8,7 @@
#include "core/file_sys/system_archive/data/font_nintendo_extended.h"
#include "core/file_sys/system_archive/data/font_standard.h"
#include "core/file_sys/system_archive/shared_font.h"
#include "core/file_sys/vfs_vector.h"
#include "core/file_sys/vfs/vfs_vector.h"
#include "core/hle/service/ns/iplatform_service_manager.h"
namespace FileSys::SystemArchive {

2
src/core/file_sys/system_archive/shared_font.h
View file

@ -3,7 +3,7 @@
#pragma once
#include "core/file_sys/vfs_types.h"
#include "core/file_sys/vfs/vfs_types.h"
namespace FileSys::SystemArchive {

2
src/core/file_sys/system_archive/system_archive.h
View file

@ -4,7 +4,7 @@
#pragma once
#include "common/common_types.h"
#include "core/file_sys/vfs_types.h"
#include "core/file_sys/vfs/vfs_types.h"
namespace FileSys::SystemArchive {

2
src/core/file_sys/system_archive/system_version.cpp
View file

@ -3,7 +3,7 @@
#include "common/logging/log.h"
#include "core/file_sys/system_archive/system_version.h"
#include "core/file_sys/vfs_vector.h"
#include "core/file_sys/vfs/vfs_vector.h"
#include "core/hle/api_version.h"
namespace FileSys::SystemArchive {

2
src/core/file_sys/system_archive/system_version.h
View file

@ -4,7 +4,7 @@
#pragma once
#include <string>
#include "core/file_sys/vfs_types.h"
#include "core/file_sys/vfs/vfs_types.h"
namespace FileSys::SystemArchive {

2
src/core/file_sys/system_archive/time_zone_binary.cpp
View file

@ -5,7 +5,7 @@
#include "common/swap.h"
#include "core/file_sys/system_archive/time_zone_binary.h"
#include "core/file_sys/vfs_vector.h"
#include "core/file_sys/vfs/vfs_vector.h"
#include "nx_tzdb.h"

2
src/core/file_sys/system_archive/time_zone_binary.h
View file

@ -3,7 +3,7 @@
#pragma once
#include "core/file_sys/vfs_types.h"
#include "core/file_sys/vfs/vfs_types.h"
namespace FileSys::SystemArchive {

2
src/core/file_sys/vfs.cpp → src/core/file_sys/vfs/vfs.cpp
View file

@ -6,7 +6,7 @@
#include <string>
#include "common/fs/path_util.h"
#include "core/file_sys/mode.h"
#include "core/file_sys/vfs.h"
#include "core/file_sys/vfs/vfs.h"
namespace FileSys {

2
src/core/file_sys/vfs.h → src/core/file_sys/vfs/vfs.h
View file

@ -13,7 +13,7 @@
#include "common/common_funcs.h"
#include "common/common_types.h"
#include "core/file_sys/vfs_types.h"
#include "core/file_sys/vfs/vfs_types.h"
namespace FileSys {

4
src/core/file_sys/vfs_cached.cpp → src/core/file_sys/vfs/vfs_cached.cpp
View file

@ -1,8 +1,8 @@
// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
#include "core/file_sys/vfs_cached.h"
#include "core/file_sys/vfs_types.h"
#include "core/file_sys/vfs/vfs_cached.h"
#include "core/file_sys/vfs/vfs_types.h"
namespace FileSys {

2
src/core/file_sys/vfs_cached.h → src/core/file_sys/vfs/vfs_cached.h
View file

@ -5,7 +5,7 @@
#include <string_view>
#include <vector>
#include "core/file_sys/vfs.h"
#include "core/file_sys/vfs/vfs.h"
namespace FileSys {

4
src/core/file_sys/vfs_concat.cpp → src/core/file_sys/vfs/vfs_concat.cpp
View file

@ -5,8 +5,8 @@
#include <utility>
#include "common/assert.h"
#include "core/file_sys/vfs_concat.h"
#include "core/file_sys/vfs_static.h"
#include "core/file_sys/vfs/vfs_concat.h"
#include "core/file_sys/vfs/vfs_static.h"
namespace FileSys {

2
src/core/file_sys/vfs_concat.h → src/core/file_sys/vfs/vfs_concat.h
View file

@ -6,7 +6,7 @@
#include <compare>
#include <map>
#include <memory>
#include "core/file_sys/vfs.h"
#include "core/file_sys/vfs/vfs.h"
namespace FileSys {

2
src/core/file_sys/vfs_layered.cpp → src/core/file_sys/vfs/vfs_layered.cpp
View file

@ -5,7 +5,7 @@
#include <set>
#include <unordered_set>
#include <utility>
#include "core/file_sys/vfs_layered.h"
#include "core/file_sys/vfs/vfs_layered.h"
namespace FileSys {

2
src/core/file_sys/vfs_layered.h → src/core/file_sys/vfs/vfs_layered.h
View file

@ -4,7 +4,7 @@
#pragma once
#include <memory>
#include "core/file_sys/vfs.h"
#include "core/file_sys/vfs/vfs.h"
namespace FileSys {

2
src/core/file_sys/vfs_offset.cpp → src/core/file_sys/vfs/vfs_offset.cpp
View file

@ -4,7 +4,7 @@
#include <algorithm>
#include <utility>
#include "core/file_sys/vfs_offset.h"
#include "core/file_sys/vfs/vfs_offset.h"
namespace FileSys {

2
src/core/file_sys/vfs_offset.h → src/core/file_sys/vfs/vfs_offset.h
View file

@ -5,7 +5,7 @@
#include <memory>
#include "core/file_sys/vfs.h"
#include "core/file_sys/vfs/vfs.h"
namespace FileSys {

4
src/core/file_sys/vfs_real.cpp → src/core/file_sys/vfs/vfs_real.cpp
View file

@ -10,8 +10,8 @@
#include "common/fs/fs.h"
#include "common/fs/path_util.h"
#include "common/logging/log.h"
#include "core/file_sys/vfs.h"
#include "core/file_sys/vfs_real.h"
#include "core/file_sys/vfs/vfs.h"
#include "core/file_sys/vfs/vfs_real.h"
// For FileTimeStampRaw
#include <sys/stat.h>

2
src/core/file_sys/vfs_real.h → src/core/file_sys/vfs/vfs_real.h
View file

@ -9,7 +9,7 @@
#include <string_view>
#include "common/intrusive_list.h"
#include "core/file_sys/mode.h"
#include "core/file_sys/vfs.h"
#include "core/file_sys/vfs/vfs.h"
namespace Common::FS {
class IOFile;

2
src/core/file_sys/vfs_static.h → src/core/file_sys/vfs/vfs_static.h
View file

@ -7,7 +7,7 @@
#include <memory>
#include <string_view>
#include "core/file_sys/vfs.h"
#include "core/file_sys/vfs/vfs.h"
namespace FileSys {

0
src/core/file_sys/vfs_types.h → src/core/file_sys/vfs/vfs_types.h
View file

2
src/core/file_sys/vfs_vector.cpp → src/core/file_sys/vfs/vfs_vector.cpp
View file

@ -3,7 +3,7 @@
#include <algorithm>
#include <utility>
#include "core/file_sys/vfs_vector.h"
#include "core/file_sys/vfs/vfs_vector.h"
namespace FileSys {
VectorVfsFile::VectorVfsFile(std::vector<u8> initial_data, std::string name_, VirtualDir parent_)

2
src/core/file_sys/vfs_vector.h → src/core/file_sys/vfs/vfs_vector.h
View file

@ -8,7 +8,7 @@
#include <memory>
#include <string>
#include <vector>
#include "core/file_sys/vfs.h"
#include "core/file_sys/vfs/vfs.h"
namespace FileSys {

2
src/core/file_sys/xts_archive.cpp
View file

@ -17,7 +17,7 @@
#include "core/crypto/key_manager.h"
#include "core/crypto/xts_encryption_layer.h"
#include "core/file_sys/content_archive.h"
#include "core/file_sys/vfs_offset.h"
#include "core/file_sys/vfs/vfs_offset.h"
#include "core/file_sys/xts_archive.h"
#include "core/loader/loader.h"

2
src/core/file_sys/xts_archive.h
View file

@ -8,7 +8,7 @@
#include "common/common_types.h"
#include "common/swap.h"
#include "core/crypto/key_manager.h"
#include "core/file_sys/vfs.h"
#include "core/file_sys/vfs/vfs.h"
namespace Loader {
enum class ResultStatus : u16;

2
src/core/hle/service/am/applets/applet_web_browser.cpp
View file

@ -15,7 +15,7 @@
#include "core/file_sys/registered_cache.h"
#include "core/file_sys/romfs.h"
#include "core/file_sys/system_archive/system_archive.h"
#include "core/file_sys/vfs_vector.h"
#include "core/file_sys/vfs/vfs_vector.h"
#include "core/frontend/applets/web_browser.h"
#include "core/hle/result.h"
#include "core/hle/service/am/am.h"

2
src/core/hle/service/am/applets/applet_web_browser.h
View file

@ -7,7 +7,7 @@
#include <optional>
#include "common/common_types.h"
#include "core/file_sys/vfs_types.h"
#include "core/file_sys/vfs/vfs_types.h"
#include "core/hle/result.h"
#include "core/hle/service/am/applets/applet_web_browser_types.h"
#include "core/hle/service/am/applets/applets.h"

2
src/core/hle/service/bcat/backend/backend.h
View file

@ -8,7 +8,7 @@
#include <string>
#include "common/common_types.h"
#include "core/file_sys/vfs_types.h"
#include "core/file_sys/vfs/vfs_types.h"
#include "core/hle/result.h"
#include "core/hle/service/kernel_helpers.h"

2
src/core/hle/service/bcat/bcat_module.cpp
View file

@ -8,7 +8,7 @@
#include "common/settings.h"
#include "common/string_util.h"
#include "core/core.h"
#include "core/file_sys/vfs.h"
#include "core/file_sys/vfs/vfs.h"
#include "core/hle/kernel/k_readable_event.h"
#include "core/hle/service/bcat/backend/backend.h"
#include "core/hle/service/bcat/bcat.h"

4
src/core/hle/service/filesystem/filesystem.cpp
View file

@ -18,8 +18,8 @@
#include "core/file_sys/romfs_factory.h"
#include "core/file_sys/savedata_factory.h"
#include "core/file_sys/sdmc_factory.h"
#include "core/file_sys/vfs.h"
#include "core/file_sys/vfs_offset.h"
#include "core/file_sys/vfs/vfs.h"
#include "core/file_sys/vfs/vfs_offset.h"
#include "core/hle/service/filesystem/filesystem.h"
#include "core/hle/service/filesystem/fsp/fsp_ldr.h"
#include "core/hle/service/filesystem/fsp/fsp_pr.h"

2
src/core/hle/service/filesystem/filesystem.h
View file

@ -6,7 +6,7 @@
#include <memory>
#include "common/common_types.h"
#include "core/file_sys/directory.h"
#include "core/file_sys/vfs.h"
#include "core/file_sys/vfs/vfs.h"
#include "core/hle/result.h"
namespace Core {

2
src/core/hle/service/filesystem/fsp/fs_i_directory.h
View file

@ -3,7 +3,7 @@
#pragma once
#include "core/file_sys/vfs.h"
#include "core/file_sys/vfs/vfs.h"
#include "core/hle/service/filesystem/filesystem.h"
#include "core/hle/service/filesystem/fsp_util.h"
#include "core/hle/service/service.h"

2
src/core/hle/service/filesystem/fsp/fs_i_filesystem.h
View file

@ -3,7 +3,7 @@
#pragma once
#include "core/file_sys/vfs.h"
#include "core/file_sys/vfs/vfs.h"
#include "core/hle/service/filesystem/filesystem.h"
#include "core/hle/service/filesystem/fsp/fsp_util.h"
#include "core/hle/service/service.h"

2
src/core/hle/service/filesystem/fsp/fs_i_storage.h
View file

@ -3,7 +3,7 @@
#pragma once
#include "core/file_sys/vfs.h"
#include "core/file_sys/vfs/vfs.h"
#include "core/hle/service/filesystem/filesystem.h"
#include "core/hle/service/service.h"

2
src/core/hle/service/filesystem/fsp/fsp_srv.cpp
View file

@ -23,7 +23,7 @@
#include "core/file_sys/romfs_factory.h"
#include "core/file_sys/savedata_factory.h"
#include "core/file_sys/system_archive/system_archive.h"
#include "core/file_sys/vfs.h"
#include "core/file_sys/vfs/vfs.h"
#include "core/hle/result.h"
#include "core/hle/service/filesystem/filesystem.h"
#include "core/hle/service/filesystem/fsp/fs_i_filesystem.h"

2
src/core/hle/service/filesystem/romfs_controller.h
View file

@ -5,7 +5,7 @@
#include "core/file_sys/nca_metadata.h"
#include "core/file_sys/romfs_factory.h"
#include "core/file_sys/vfs_types.h"
#include "core/file_sys/vfs/vfs_types.h"
namespace Service::FileSystem {

2
src/core/hle/service/filesystem/save_data_controller.h
View file

@ -5,7 +5,7 @@
#include "core/file_sys/nca_metadata.h"
#include "core/file_sys/savedata_factory.h"
#include "core/file_sys/vfs_types.h"
#include "core/file_sys/vfs/vfs_types.h"
namespace Service::FileSystem {

2
src/core/hle/service/ns/ns.cpp
View file

@ -6,7 +6,7 @@
#include "core/core.h"
#include "core/file_sys/control_metadata.h"
#include "core/file_sys/patch_manager.h"
#include "core/file_sys/vfs.h"
#include "core/file_sys/vfs/vfs.h"
#include "core/hle/service/filesystem/filesystem.h"
#include "core/hle/service/glue/glue_manager.h"
#include "core/hle/service/ipc_helpers.h"

2
src/core/loader/loader.h
View file

@ -14,7 +14,7 @@
#include "common/common_funcs.h"
#include "common/common_types.h"
#include "core/file_sys/control_metadata.h"
#include "core/file_sys/vfs.h"
#include "core/file_sys/vfs/vfs.h"
namespace Core {
class System;

2
src/core/loader/nro.cpp
View file

@ -12,7 +12,7 @@
#include "core/core.h"
#include "core/file_sys/control_metadata.h"
#include "core/file_sys/romfs_factory.h"
#include "core/file_sys/vfs_offset.h"
#include "core/file_sys/vfs/vfs_offset.h"
#include "core/hle/kernel/code_set.h"
#include "core/hle/kernel/k_page_table.h"
#include "core/hle/kernel/k_process.h"

2
src/yuzu/configuration/configure_per_game.h
View file

@ -11,7 +11,7 @@
#include <QList>
#include "configuration/shared_widget.h"
#include "core/file_sys/vfs_types.h"
#include "core/file_sys/vfs/vfs_types.h"
#include "frontend_common/config.h"
#include "vk_device_info.h"
#include "yuzu/configuration/configuration_shared.h"

2
src/yuzu/configuration/configure_per_game_addons.h
View file

@ -8,7 +8,7 @@
#include <QList>
#include "core/file_sys/vfs_types.h"
#include "core/file_sys/vfs/vfs_types.h"
namespace Core {
class System;

4
src/yuzu/main.cpp
View file

@ -35,8 +35,8 @@
#include "configuration/configure_per_game.h"
#include "configuration/configure_tas.h"
#include "core/file_sys/romfs_factory.h"
#include "core/file_sys/vfs.h"
#include "core/file_sys/vfs_real.h"
#include "core/file_sys/vfs/vfs.h"
#include "core/file_sys/vfs/vfs_real.h"
#include "core/frontend/applets/cabinet.h"
#include "core/frontend/applets/controller.h"
#include "core/frontend/applets/general_frontend.h"

2
src/yuzu_cmd/yuzu.cpp
View file

@ -25,7 +25,7 @@
#include "core/cpu_manager.h"
#include "core/crypto/key_manager.h"
#include "core/file_sys/registered_cache.h"
#include "core/file_sys/vfs_real.h"
#include "core/file_sys/vfs/vfs_real.h"
#include "core/hle/service/filesystem/filesystem.h"
#include "core/loader/loader.h"
#include "core/telemetry_session.h"