N-archive/suyu
1
0
Fork 0
mirror of https://git.suyu.dev/suyu/suyu.git synced 2024-11-22 14:52:45 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Core: Cleanup file_sys includes.

Browse source
This commit is contained in:
Emmanuel Gil Peyrot 2015-06-21 15:44:11 +01:00
parent aea15f5c73
commit e5fcabdd69
22 changed files with 73 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/common/make_unique.h
View file

@ -4,6 +4,7 @@
#pragma once #pragma once
#include <algorithm>
#include <memory> #include <memory>
namespace Common { namespace Common {

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

@ -2,6 +2,8 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include <cstddef>
#include <iomanip>
#include <sstream> #include <sstream>
#include "common/logging/log.h" #include "common/logging/log.h"

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

@ -2,7 +2,8 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include <sys/stat.h> #include <algorithm>
#include <vector>
#include "common/common_types.h" #include "common/common_types.h"
#include "common/file_util.h" #include "common/file_util.h"
@ -13,7 +14,6 @@
#include "core/file_sys/archive_extsavedata.h" #include "core/file_sys/archive_extsavedata.h"
#include "core/file_sys/disk_archive.h" #include "core/file_sys/disk_archive.h"
#include "core/hle/service/fs/archive.h" #include "core/hle/service/fs/archive.h"
#include "core/settings.h"
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
// FileSys namespace // FileSys namespace

7
src/core/file_sys/archive_extsavedata.h
View file

@ -4,10 +4,13 @@
#pragma once #pragma once
#include <memory>
#include <string>
#include "common/common_types.h" #include "common/common_types.h"
#include "core/file_sys/disk_archive.h" #include "core/file_sys/archive_backend.h"
#include "core/loader/loader.h" #include "core/hle/result.h"
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
// FileSys namespace // FileSys namespace

3
src/core/file_sys/archive_romfs.cpp
View file

@ -2,14 +2,15 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include <algorithm>
#include <memory> #include <memory>
#include "common/common_types.h" #include "common/common_types.h"
#include "common/file_util.h"
#include "common/logging/log.h" #include "common/logging/log.h"
#include "common/make_unique.h" #include "common/make_unique.h"
#include "core/file_sys/archive_romfs.h" #include "core/file_sys/archive_romfs.h"
#include "core/file_sys/ivfc_archive.h"
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
// FileSys namespace // FileSys namespace

4
src/core/file_sys/archive_romfs.h
View file

@ -5,11 +5,13 @@
#pragma once #pragma once
#include <memory> #include <memory>
#include <string>
#include <vector> #include <vector>
#include "common/common_types.h" #include "common/common_types.h"
#include "core/file_sys/ivfc_archive.h" #include "core/file_sys/archive_backend.h"
#include "core/hle/result.h"
#include "core/loader/loader.h" #include "core/loader/loader.h"
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////

3
src/core/file_sys/archive_savedata.cpp
View file

@ -2,7 +2,7 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include <sys/stat.h> #include <algorithm>
#include "common/common_types.h" #include "common/common_types.h"
#include "common/file_util.h" #include "common/file_util.h"
@ -14,7 +14,6 @@
#include "core/file_sys/disk_archive.h" #include "core/file_sys/disk_archive.h"
#include "core/hle/kernel/process.h" #include "core/hle/kernel/process.h"
#include "core/hle/service/fs/archive.h" #include "core/hle/service/fs/archive.h"
#include "core/settings.h"
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
// FileSys namespace // FileSys namespace

7
src/core/file_sys/archive_savedata.h
View file

@ -4,10 +4,11 @@
#pragma once #pragma once
#include "common/common_types.h" #include <memory>
#include <string>
#include "core/file_sys/disk_archive.h" #include "core/file_sys/archive_backend.h"
#include "core/loader/loader.h" #include "core/hle/result.h"
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
// FileSys namespace // FileSys namespace

5
src/core/file_sys/archive_savedatacheck.cpp
View file

@ -2,12 +2,17 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include <algorithm>
#include <vector>
#include "common/common_types.h"
#include "common/file_util.h" #include "common/file_util.h"
#include "common/logging/log.h" #include "common/logging/log.h"
#include "common/make_unique.h" #include "common/make_unique.h"
#include "common/string_util.h" #include "common/string_util.h"
#include "core/file_sys/archive_savedatacheck.h" #include "core/file_sys/archive_savedatacheck.h"
#include "core/file_sys/ivfc_archive.h"
#include "core/hle/service/fs/archive.h" #include "core/hle/service/fs/archive.h"
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////

9
src/core/file_sys/archive_savedatacheck.h
View file

@ -4,12 +4,11 @@
#pragma once #pragma once
#include <vector> #include <memory>
#include <string>
#include "common/common_types.h" #include "core/file_sys/archive_backend.h"
#include "core/hle/result.h"
#include "core/file_sys/ivfc_archive.h"
#include "core/loader/loader.h"
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
// FileSys namespace // FileSys namespace

3
src/core/file_sys/archive_sdmc.cpp
View file

@ -2,9 +2,8 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include <sys/stat.h> #include <algorithm>
#include "common/common_types.h"
#include "common/file_util.h" #include "common/file_util.h"
#include "common/logging/log.h" #include "common/logging/log.h"
#include "common/make_unique.h" #include "common/make_unique.h"

7
src/core/file_sys/archive_sdmc.h
View file

@ -4,10 +4,11 @@
#pragma once #pragma once
#include "common/common_types.h" #include <memory>
#include <string>
#include "core/file_sys/disk_archive.h" #include "core/file_sys/archive_backend.h"
#include "core/loader/loader.h" #include "core/hle/result.h"
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
// FileSys namespace // FileSys namespace

5
src/core/file_sys/archive_systemsavedata.cpp
View file

@ -2,7 +2,8 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include <sys/stat.h> #include <algorithm>
#include <vector>
#include "common/common_types.h" #include "common/common_types.h"
#include "common/file_util.h" #include "common/file_util.h"
@ -10,8 +11,8 @@
#include "common/string_util.h" #include "common/string_util.h"
#include "core/file_sys/archive_systemsavedata.h" #include "core/file_sys/archive_systemsavedata.h"
#include "core/file_sys/disk_archive.h"
#include "core/hle/service/fs/archive.h" #include "core/hle/service/fs/archive.h"
#include "core/settings.h"
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
// FileSys namespace // FileSys namespace

7
src/core/file_sys/archive_systemsavedata.h
View file

@ -4,10 +4,13 @@
#pragma once #pragma once
#include <memory>
#include <string>
#include "common/common_types.h" #include "common/common_types.h"
#include "core/file_sys/disk_archive.h" #include "core/file_sys/archive_backend.h"
#include "core/loader/loader.h" #include "core/hle/result.h"
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
// FileSys namespace // FileSys namespace

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

@ -2,7 +2,8 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include <sys/stat.h> #include <algorithm>
#include <cstdio>
#include "common/common_types.h" #include "common/common_types.h"
#include "common/file_util.h" #include "common/file_util.h"
@ -10,7 +11,6 @@
#include "common/make_unique.h" #include "common/make_unique.h"
#include "core/file_sys/disk_archive.h" #include "core/file_sys/disk_archive.h"
#include "core/settings.h"
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
// FileSys namespace // FileSys namespace

7
src/core/file_sys/disk_archive.h
View file

@ -4,13 +4,18 @@
#pragma once #pragma once
#include <cstddef>
#include <memory>
#include <string>
#include <vector>
#include "common/common_types.h" #include "common/common_types.h"
#include "common/file_util.h" #include "common/file_util.h"
#include "core/file_sys/archive_backend.h" #include "core/file_sys/archive_backend.h"
#include "core/file_sys/directory_backend.h" #include "core/file_sys/directory_backend.h"
#include "core/file_sys/file_backend.h" #include "core/file_sys/file_backend.h"
#include "core/loader/loader.h" #include "core/hle/result.h"
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
// FileSys namespace // FileSys namespace

1
src/core/file_sys/ivfc_archive.cpp
View file

@ -6,7 +6,6 @@
#include <memory> #include <memory>
#include "common/common_types.h" #include "common/common_types.h"
#include "common/file_util.h"
#include "common/logging/log.h" #include "common/logging/log.h"
#include "common/make_unique.h" #include "common/make_unique.h"

4
src/core/file_sys/ivfc_archive.h
View file

@ -4,7 +4,9 @@
#pragma once #pragma once
#include <cstddef>
#include <memory> #include <memory>
#include <string>
#include <vector> #include <vector>
#include "common/common_types.h" #include "common/common_types.h"
@ -12,7 +14,7 @@
#include "core/file_sys/archive_backend.h" #include "core/file_sys/archive_backend.h"
#include "core/file_sys/directory_backend.h" #include "core/file_sys/directory_backend.h"
#include "core/file_sys/file_backend.h" #include "core/file_sys/file_backend.h"
#include "core/loader/loader.h" #include "core/hle/result.h"
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
// FileSys namespace // FileSys namespace

3
src/core/hle/kernel/process.h
View file

@ -5,6 +5,8 @@
#pragma once #pragma once
#include <bitset> #include <bitset>
#include <cstddef>
#include <string>
#include <boost/container/static_vector.hpp> #include <boost/container/static_vector.hpp>
@ -12,7 +14,6 @@
#include "common/common_types.h" #include "common/common_types.h"
#include "core/hle/kernel/kernel.h" #include "core/hle/kernel/kernel.h"
#include "core/hle/result.h"
namespace Kernel { namespace Kernel {

10
src/core/hle/service/fs/archive.cpp
View file

@ -2,29 +2,35 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include <cstddef>
#include <system_error>
#include <type_traits>
#include <memory> #include <memory>
#include <unordered_map> #include <unordered_map>
#include <utility>
#include <boost/container/flat_map.hpp> #include <boost/container/flat_map.hpp>
#include "common/assert.h"
#include "common/common_types.h" #include "common/common_types.h"
#include "common/file_util.h" #include "common/file_util.h"
#include "common/logging/log.h" #include "common/logging/log.h"
#include "common/make_unique.h" #include "common/make_unique.h"
#include "common/math_util.h"
#include "core/file_sys/archive_backend.h" #include "core/file_sys/archive_backend.h"
#include "core/file_sys/archive_extsavedata.h" #include "core/file_sys/archive_extsavedata.h"
#include "core/file_sys/archive_romfs.h"
#include "core/file_sys/archive_savedata.h" #include "core/file_sys/archive_savedata.h"
#include "core/file_sys/archive_savedatacheck.h" #include "core/file_sys/archive_savedatacheck.h"
#include "core/file_sys/archive_sdmc.h" #include "core/file_sys/archive_sdmc.h"
#include "core/file_sys/archive_systemsavedata.h" #include "core/file_sys/archive_systemsavedata.h"
#include "core/file_sys/directory_backend.h" #include "core/file_sys/directory_backend.h"
#include "core/file_sys/file_backend.h"
#include "core/hle/hle.h"
#include "core/hle/service/service.h" #include "core/hle/service/service.h"
#include "core/hle/service/fs/archive.h" #include "core/hle/service/fs/archive.h"
#include "core/hle/service/fs/fs_user.h" #include "core/hle/service/fs/fs_user.h"
#include "core/hle/result.h" #include "core/hle/result.h"
#include "core/memory.h"
// Specializes std::hash for ArchiveIdCode, so that we can use it in std::unordered_map. // Specializes std::hash for ArchiveIdCode, so that we can use it in std::unordered_map.
// Workaroung for libstdc++ bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=60970 // Workaroung for libstdc++ bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=60970

13
src/core/hle/service/fs/archive.h
View file

@ -4,22 +4,25 @@
#pragma once #pragma once
#include <memory>
#include <string>
#include "common/common_types.h" #include "common/common_types.h"
#include "core/file_sys/archive_backend.h" #include "core/file_sys/archive_backend.h"
#include "core/hle/kernel/kernel.h"
#include "core/hle/kernel/session.h" #include "core/hle/kernel/session.h"
#include "core/hle/result.h" #include "core/hle/result.h"
namespace FileSys {
class DirectoryBackend;
class FileBackend;
}
/// The unique system identifier hash, also known as ID0 /// The unique system identifier hash, also known as ID0
extern const std::string SYSTEM_ID; extern const std::string SYSTEM_ID;
/// The scrambled SD card CID, also known as ID1 /// The scrambled SD card CID, also known as ID1
extern const std::string SDCARD_ID; extern const std::string SDCARD_ID;
namespace Kernel {
class Session;
}
namespace Service { namespace Service {
namespace FS { namespace FS {

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

@ -4,6 +4,7 @@
#pragma once #pragma once
#include <cstddef>
#include <string> #include <string>
#include <unordered_map> #include <unordered_map>
@ -12,6 +13,7 @@
#include "common/common_types.h" #include "common/common_types.h"
#include "core/hle/kernel/session.h" #include "core/hle/kernel/session.h"
#include "core/hle/result.h"
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
// Namespace Service // Namespace Service