vfs: Move vfs files to their own directory

author: FearlessTobi 2024-01-16 06:23:01 +0100
committer: Liam 2024-01-25 16:40:42 -0500
commit: 0f9288e38d80c6c63a545934557501fae40d3d83 (patch)
tree: 0643100d2471a1545dbfb447319b6ea26fdd6b63 /src/core/file_sys/fssystem
parent: fs: Move fsp_srv subclasses to separate files (diff)
download: yuzu-0f9288e38d80c6c63a545934557501fae40d3d83.tar.gz
yuzu-0f9288e38d80c6c63a545934557501fae40d3d83.tar.xz
yuzu-0f9288e38d80c6c63a545934557501fae40d3d83.zip
13 files changed, 15 insertions, 15 deletions
diff --git a/src/core/file_sys/fssystem/fs_i_storage.h b/src/core/file_sys/fssystem/fs_i_storage.h
index 416dd57b8..37336c9ae 100644
--- a/src/core/file_sys/fssystem/fs_i_storage.h
+++ b/src/core/file_sys/fssystem/fs_i_storage.h
@@ -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 {
diff --git a/src/core/file_sys/fssystem/fssystem_aes_ctr_counter_extended_storage.cpp b/src/core/file_sys/fssystem/fssystem_aes_ctr_counter_extended_storage.cpp
index f25c95472..bc1cddbb0 100644
--- a/src/core/file_sys/fssystem/fssystem_aes_ctr_counter_extended_storage.cpp
+++ b/src/core/file_sys/fssystem/fssystem_aes_ctr_counter_extended_storage.cpp
@@ -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 {
diff --git a/src/core/file_sys/fssystem/fssystem_aes_ctr_storage.h b/src/core/file_sys/fssystem/fssystem_aes_ctr_storage.h
index 339e49697..5abd93d33 100644
--- a/src/core/file_sys/fssystem/fssystem_aes_ctr_storage.h
+++ b/src/core/file_sys/fssystem/fssystem_aes_ctr_storage.h
@@ -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 {
diff --git a/src/core/file_sys/fssystem/fssystem_bucket_tree.h b/src/core/file_sys/fssystem/fssystem_bucket_tree.h
index 46850cd48..3a5e21d1a 100644
--- a/src/core/file_sys/fssystem/fssystem_bucket_tree.h
+++ b/src/core/file_sys/fssystem/fssystem_bucket_tree.h
@@ -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 {
diff --git a/src/core/file_sys/fssystem/fssystem_compressed_storage.h b/src/core/file_sys/fssystem/fssystem_compressed_storage.h
index 33d93938e..74c98630e 100644
--- a/src/core/file_sys/fssystem/fssystem_compressed_storage.h
+++ b/src/core/file_sys/fssystem/fssystem_compressed_storage.h
@@ -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 {
diff --git a/src/core/file_sys/fssystem/fssystem_hierarchical_integrity_verification_storage.cpp b/src/core/file_sys/fssystem/fssystem_hierarchical_integrity_verification_storage.cpp
index 4a75b5308..39bb7b808 100644
--- a/src/core/file_sys/fssystem/fssystem_hierarchical_integrity_verification_storage.cpp
+++ b/src/core/file_sys/fssystem/fssystem_hierarchical_integrity_verification_storage.cpp
@@ -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 {
diff --git a/src/core/file_sys/fssystem/fssystem_hierarchical_integrity_verification_storage.h b/src/core/file_sys/fssystem/fssystem_hierarchical_integrity_verification_storage.h
index 5cf697efe..bd129db47 100644
--- a/src/core/file_sys/fssystem/fssystem_hierarchical_integrity_verification_storage.h
+++ b/src/core/file_sys/fssystem/fssystem_hierarchical_integrity_verification_storage.h
@@ -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 {
diff --git a/src/core/file_sys/fssystem/fssystem_hierarchical_sha256_storage.h b/src/core/file_sys/fssystem/fssystem_hierarchical_sha256_storage.h
index 18df400af..41d3960b8 100644
--- a/src/core/file_sys/fssystem/fssystem_hierarchical_sha256_storage.h
+++ b/src/core/file_sys/fssystem/fssystem_hierarchical_sha256_storage.h
@@ -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 {
diff --git a/src/core/file_sys/fssystem/fssystem_indirect_storage.h b/src/core/file_sys/fssystem/fssystem_indirect_storage.h
index 7854335bf..d4b95fd27 100644
--- a/src/core/file_sys/fssystem/fssystem_indirect_storage.h
+++ b/src/core/file_sys/fssystem/fssystem_indirect_storage.h
@@ -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/vfs.h"
-#include "core/file_sys/vfs_offset.h"
+#include "core/file_sys/vfs/vfs_offset.h"
 namespace FileSys {
diff --git a/src/core/file_sys/fssystem/fssystem_integrity_romfs_storage.h b/src/core/file_sys/fssystem/fssystem_integrity_romfs_storage.h
index 5f8512b2a..240d1e388 100644
--- a/src/core/file_sys/fssystem/fssystem_integrity_romfs_storage.h
+++ b/src/core/file_sys/fssystem/fssystem_integrity_romfs_storage.h
@@ -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 {
diff --git a/src/core/file_sys/fssystem/fssystem_nca_file_system_driver.cpp b/src/core/file_sys/fssystem/fssystem_nca_file_system_driver.cpp
index 0f5432203..ab5a7984e 100644
--- a/src/core/file_sys/fssystem/fssystem_nca_file_system_driver.cpp
+++ b/src/core/file_sys/fssystem/fssystem_nca_file_system_driver.cpp
@@ -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/vfs_offset.h"
-#include "core/file_sys/vfs_vector.h"
+#include "core/file_sys/vfs/vfs_vector.h"
 namespace FileSys {
diff --git a/src/core/file_sys/fssystem/fssystem_nca_file_system_driver.h b/src/core/file_sys/fssystem/fssystem_nca_file_system_driver.h
index 5771a21fc..5bc838de6 100644
--- a/src/core/file_sys/fssystem/fssystem_nca_file_system_driver.h
+++ b/src/core/file_sys/fssystem/fssystem_nca_file_system_driver.h
@@ -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 {
diff --git a/src/core/file_sys/fssystem/fssystem_nca_reader.cpp b/src/core/file_sys/fssystem/fssystem_nca_reader.cpp
index a3714ab37..08924e2a6 100644
--- a/src/core/file_sys/fssystem/fssystem_nca_reader.cpp
+++ b/src/core/file_sys/fssystem/fssystem_nca_reader.cpp
@@ -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 {
author	FearlessTobi	2024-01-16 06:23:01 +0100
committer	Liam	2024-01-25 16:40:42 -0500
commit	0f9288e38d80c6c63a545934557501fae40d3d83 (patch)
tree	0643100d2471a1545dbfb447319b6ea26fdd6b63 /src/core/file_sys/fssystem
parent	fs: Move fsp_srv subclasses to separate files (diff)
download	yuzu-0f9288e38d80c6c63a545934557501fae40d3d83.tar.gz yuzu-0f9288e38d80c6c63a545934557501fae40d3d83.tar.xz yuzu-0f9288e38d80c6c63a545934557501fae40d3d83.zip

diff --git a/src/core/file_sys/fssystem/fs_i_storage.h b/src/core/file_sys/fssystem/fs_i_storage.h index 416dd57b8..37336c9ae 100644 --- a/src/core/file_sys/fssystem/fs_i_storage.h +++ b/src/core/file_sys/fssystem/fs_i_storage.h
@@ -5,7 +5,7 @@
5		5
6	#include "common/overflow.h"	6	#include "common/overflow.h"
7	#include "core/file_sys/errors.h"	7	#include "core/file_sys/errors.h"
8	#include "core/file_sys/vfs.h"	8	#include "core/file_sys/vfs/vfs.h"
9		9
10	namespace FileSys {	10	namespace FileSys {
11		11


diff --git a/src/core/file_sys/fssystem/fssystem_aes_ctr_counter_extended_storage.cpp b/src/core/file_sys/fssystem/fssystem_aes_ctr_counter_extended_storage.cpp index f25c95472..bc1cddbb0 100644 --- a/src/core/file_sys/fssystem/fssystem_aes_ctr_counter_extended_storage.cpp +++ b/src/core/file_sys/fssystem/fssystem_aes_ctr_counter_extended_storage.cpp
@@ -4,7 +4,7 @@
4	#include "core/file_sys/fssystem/fssystem_aes_ctr_counter_extended_storage.h"	4	#include "core/file_sys/fssystem/fssystem_aes_ctr_counter_extended_storage.h"
5	#include "core/file_sys/fssystem/fssystem_aes_ctr_storage.h"	5	#include "core/file_sys/fssystem/fssystem_aes_ctr_storage.h"
6	#include "core/file_sys/fssystem/fssystem_nca_header.h"	6	#include "core/file_sys/fssystem/fssystem_nca_header.h"
7	#include "core/file_sys/vfs_offset.h"	7	#include "core/file_sys/vfs/vfs_offset.h"
8		8
9	namespace FileSys {	9	namespace FileSys {
10		10


diff --git a/src/core/file_sys/fssystem/fssystem_aes_ctr_storage.h b/src/core/file_sys/fssystem/fssystem_aes_ctr_storage.h index 339e49697..5abd93d33 100644 --- a/src/core/file_sys/fssystem/fssystem_aes_ctr_storage.h +++ b/src/core/file_sys/fssystem/fssystem_aes_ctr_storage.h
@@ -9,7 +9,7 @@
9	#include "core/crypto/key_manager.h"	9	#include "core/crypto/key_manager.h"
10	#include "core/file_sys/errors.h"	10	#include "core/file_sys/errors.h"
11	#include "core/file_sys/fssystem/fs_i_storage.h"	11	#include "core/file_sys/fssystem/fs_i_storage.h"
12	#include "core/file_sys/vfs.h"	12	#include "core/file_sys/vfs/vfs.h"
13		13
14	namespace FileSys {	14	namespace FileSys {
15		15


diff --git a/src/core/file_sys/fssystem/fssystem_bucket_tree.h b/src/core/file_sys/fssystem/fssystem_bucket_tree.h index 46850cd48..3a5e21d1a 100644 --- a/src/core/file_sys/fssystem/fssystem_bucket_tree.h +++ b/src/core/file_sys/fssystem/fssystem_bucket_tree.h
@@ -10,7 +10,7 @@
10	#include "common/common_types.h"	10	#include "common/common_types.h"
11	#include "common/literals.h"	11	#include "common/literals.h"
12		12
13	#include "core/file_sys/vfs.h"	13	#include "core/file_sys/vfs/vfs.h"
14	#include "core/hle/result.h"	14	#include "core/hle/result.h"
15		15
16	namespace FileSys {	16	namespace FileSys {


diff --git a/src/core/file_sys/fssystem/fssystem_compressed_storage.h b/src/core/file_sys/fssystem/fssystem_compressed_storage.h index 33d93938e..74c98630e 100644 --- a/src/core/file_sys/fssystem/fssystem_compressed_storage.h +++ b/src/core/file_sys/fssystem/fssystem_compressed_storage.h
@@ -10,7 +10,7 @@
10	#include "core/file_sys/fssystem/fssystem_bucket_tree.h"	10	#include "core/file_sys/fssystem/fssystem_bucket_tree.h"
11	#include "core/file_sys/fssystem/fssystem_compression_common.h"	11	#include "core/file_sys/fssystem/fssystem_compression_common.h"
12	#include "core/file_sys/fssystem/fssystem_pooled_buffer.h"	12	#include "core/file_sys/fssystem/fssystem_pooled_buffer.h"
13	#include "core/file_sys/vfs.h"	13	#include "core/file_sys/vfs/vfs.h"
14		14
15	namespace FileSys {	15	namespace FileSys {
16		16


diff --git a/src/core/file_sys/fssystem/fssystem_hierarchical_integrity_verification_storage.cpp b/src/core/file_sys/fssystem/fssystem_hierarchical_integrity_verification_storage.cpp index 4a75b5308..39bb7b808 100644 --- a/src/core/file_sys/fssystem/fssystem_hierarchical_integrity_verification_storage.cpp +++ b/src/core/file_sys/fssystem/fssystem_hierarchical_integrity_verification_storage.cpp
@@ -2,7 +2,7 @@
2	// SPDX-License-Identifier: GPL-2.0-or-later	2	// SPDX-License-Identifier: GPL-2.0-or-later
3		3
4	#include "core/file_sys/fssystem/fssystem_hierarchical_integrity_verification_storage.h"	4	#include "core/file_sys/fssystem/fssystem_hierarchical_integrity_verification_storage.h"
5	#include "core/file_sys/vfs_offset.h"	5	#include "core/file_sys/vfs/vfs_offset.h"
6		6
7	namespace FileSys {	7	namespace FileSys {
8		8


diff --git a/src/core/file_sys/fssystem/fssystem_hierarchical_integrity_verification_storage.h b/src/core/file_sys/fssystem/fssystem_hierarchical_integrity_verification_storage.h index 5cf697efe..bd129db47 100644 --- a/src/core/file_sys/fssystem/fssystem_hierarchical_integrity_verification_storage.h +++ b/src/core/file_sys/fssystem/fssystem_hierarchical_integrity_verification_storage.h
@@ -8,7 +8,7 @@
8	#include "core/file_sys/fssystem/fs_types.h"	8	#include "core/file_sys/fssystem/fs_types.h"
9	#include "core/file_sys/fssystem/fssystem_alignment_matching_storage.h"	9	#include "core/file_sys/fssystem/fssystem_alignment_matching_storage.h"
10	#include "core/file_sys/fssystem/fssystem_integrity_verification_storage.h"	10	#include "core/file_sys/fssystem/fssystem_integrity_verification_storage.h"
11	#include "core/file_sys/vfs_offset.h"	11	#include "core/file_sys/vfs/vfs_offset.h"
12		12
13	namespace FileSys {	13	namespace FileSys {
14		14


diff --git a/src/core/file_sys/fssystem/fssystem_hierarchical_sha256_storage.h b/src/core/file_sys/fssystem/fssystem_hierarchical_sha256_storage.h index 18df400af..41d3960b8 100644 --- a/src/core/file_sys/fssystem/fssystem_hierarchical_sha256_storage.h +++ b/src/core/file_sys/fssystem/fssystem_hierarchical_sha256_storage.h
@@ -7,7 +7,7 @@
7		7
8	#include "core/file_sys/errors.h"	8	#include "core/file_sys/errors.h"
9	#include "core/file_sys/fssystem/fs_i_storage.h"	9	#include "core/file_sys/fssystem/fs_i_storage.h"
10	#include "core/file_sys/vfs.h"	10	#include "core/file_sys/vfs/vfs.h"
11		11
12	namespace FileSys {	12	namespace FileSys {
13		13


diff --git a/src/core/file_sys/fssystem/fssystem_indirect_storage.h b/src/core/file_sys/fssystem/fssystem_indirect_storage.h index 7854335bf..d4b95fd27 100644 --- a/src/core/file_sys/fssystem/fssystem_indirect_storage.h +++ b/src/core/file_sys/fssystem/fssystem_indirect_storage.h
@@ -7,8 +7,8 @@
7	#include "core/file_sys/fssystem/fs_i_storage.h"	7	#include "core/file_sys/fssystem/fs_i_storage.h"
8	#include "core/file_sys/fssystem/fssystem_bucket_tree.h"	8	#include "core/file_sys/fssystem/fssystem_bucket_tree.h"
9	#include "core/file_sys/fssystem/fssystem_bucket_tree_template_impl.h"	9	#include "core/file_sys/fssystem/fssystem_bucket_tree_template_impl.h"
10	#include "core/file_sys/vfs.h"	10	#include "core/file_sys/vfs/vfs.h"
11	#include "core/file_sys/vfs_offset.h"	11	#include "core/file_sys/vfs/vfs_offset.h"
12		12
13	namespace FileSys {	13	namespace FileSys {
14		14


diff --git a/src/core/file_sys/fssystem/fssystem_integrity_romfs_storage.h b/src/core/file_sys/fssystem/fssystem_integrity_romfs_storage.h index 5f8512b2a..240d1e388 100644 --- a/src/core/file_sys/fssystem/fssystem_integrity_romfs_storage.h +++ b/src/core/file_sys/fssystem/fssystem_integrity_romfs_storage.h
@@ -5,7 +5,7 @@
5		5
6	#include "core/file_sys/fssystem/fssystem_hierarchical_integrity_verification_storage.h"	6	#include "core/file_sys/fssystem/fssystem_hierarchical_integrity_verification_storage.h"
7	#include "core/file_sys/fssystem/fssystem_nca_header.h"	7	#include "core/file_sys/fssystem/fssystem_nca_header.h"
8	#include "core/file_sys/vfs_vector.h"	8	#include "core/file_sys/vfs/vfs_vector.h"
9		9
10	namespace FileSys {	10	namespace FileSys {
11		11


diff --git a/src/core/file_sys/fssystem/fssystem_nca_file_system_driver.cpp b/src/core/file_sys/fssystem/fssystem_nca_file_system_driver.cpp index 0f5432203..ab5a7984e 100644 --- a/src/core/file_sys/fssystem/fssystem_nca_file_system_driver.cpp +++ b/src/core/file_sys/fssystem/fssystem_nca_file_system_driver.cpp
@@ -14,8 +14,8 @@
14	#include "core/file_sys/fssystem/fssystem_nca_file_system_driver.h"	14	#include "core/file_sys/fssystem/fssystem_nca_file_system_driver.h"
15	#include "core/file_sys/fssystem/fssystem_sparse_storage.h"	15	#include "core/file_sys/fssystem/fssystem_sparse_storage.h"
16	#include "core/file_sys/fssystem/fssystem_switch_storage.h"	16	#include "core/file_sys/fssystem/fssystem_switch_storage.h"
17	#include "core/file_sys/vfs_offset.h"	17	#include "core/file_sys/vfs/vfs_offset.h"
18	#include "core/file_sys/vfs_vector.h"	18	#include "core/file_sys/vfs/vfs_vector.h"
19		19
20	namespace FileSys {	20	namespace FileSys {
21		21


diff --git a/src/core/file_sys/fssystem/fssystem_nca_file_system_driver.h b/src/core/file_sys/fssystem/fssystem_nca_file_system_driver.h index 5771a21fc..5bc838de6 100644 --- a/src/core/file_sys/fssystem/fssystem_nca_file_system_driver.h +++ b/src/core/file_sys/fssystem/fssystem_nca_file_system_driver.h
@@ -5,7 +5,7 @@
5		5
6	#include "core/file_sys/fssystem/fssystem_compression_common.h"	6	#include "core/file_sys/fssystem/fssystem_compression_common.h"
7	#include "core/file_sys/fssystem/fssystem_nca_header.h"	7	#include "core/file_sys/fssystem/fssystem_nca_header.h"
8	#include "core/file_sys/vfs.h"	8	#include "core/file_sys/vfs/vfs.h"
9		9
10	namespace FileSys {	10	namespace FileSys {
11		11


diff --git a/src/core/file_sys/fssystem/fssystem_nca_reader.cpp b/src/core/file_sys/fssystem/fssystem_nca_reader.cpp index a3714ab37..08924e2a6 100644 --- a/src/core/file_sys/fssystem/fssystem_nca_reader.cpp +++ b/src/core/file_sys/fssystem/fssystem_nca_reader.cpp
@@ -3,7 +3,7 @@
3		3
4	#include "core/file_sys/fssystem/fssystem_aes_xts_storage.h"	4	#include "core/file_sys/fssystem/fssystem_aes_xts_storage.h"
5	#include "core/file_sys/fssystem/fssystem_nca_file_system_driver.h"	5	#include "core/file_sys/fssystem/fssystem_nca_file_system_driver.h"
6	#include "core/file_sys/vfs_offset.h"	6	#include "core/file_sys/vfs/vfs_offset.h"
7		7
8	namespace FileSys {	8	namespace FileSys {
9		9