CCF_100
/
yuzu-mirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Core: Cleanup file_sys includes.

master
Emmanuel Gil Peyrot 2015-06-21 15:44:11 +07: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
Unescape Escape View File

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

2
src/core/file_sys/archive_backend.cpp
Unescape Escape View File

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

4
src/core/file_sys/archive_extsavedata.cpp
Unescape Escape View File

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

7
src/core/file_sys/archive_extsavedata.h
Unescape Escape View File

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

3
src/core/file_sys/archive_romfs.cpp
Unescape Escape View File

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

4
src/core/file_sys/archive_romfs.h
Unescape Escape View File

@ -5,11 +5,13 @@
#pragma once
#include <memory>
#include <string>
#include <vector>
#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"
////////////////////////////////////////////////////////////////////////////////////////////////////

3
src/core/file_sys/archive_savedata.cpp
Unescape Escape View File

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

7
src/core/file_sys/archive_savedata.h
Unescape Escape View File

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

5
src/core/file_sys/archive_savedatacheck.cpp
Unescape Escape View File

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

9
src/core/file_sys/archive_savedatacheck.h
Unescape Escape View File

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

3
src/core/file_sys/archive_sdmc.cpp
Unescape Escape View File

@ -2,9 +2,8 @@
// Licensed under GPLv2 or any later version
// 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/logging/log.h"
#include "common/make_unique.h"

7
src/core/file_sys/archive_sdmc.h
Unescape Escape View File

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

5
src/core/file_sys/archive_systemsavedata.cpp
Unescape Escape View File

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

7
src/core/file_sys/archive_systemsavedata.h
Unescape Escape View File

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

4
src/core/file_sys/disk_archive.cpp
Unescape Escape View File

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

7
src/core/file_sys/disk_archive.h
Unescape Escape View File

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

1
src/core/file_sys/ivfc_archive.cpp
Unescape Escape View File

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

4
src/core/file_sys/ivfc_archive.h
Unescape Escape View File

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

3
src/core/hle/kernel/process.h
Unescape Escape View File

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

10
src/core/hle/service/fs/archive.cpp
Unescape Escape View File

@ -2,29 +2,35 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
#include <cstddef>
#include <system_error>
#include <type_traits>
#include <memory>
#include <unordered_map>
#include <utility>
#include <boost/container/flat_map.hpp>
#include "common/assert.h"
#include "common/common_types.h"
#include "common/file_util.h"
#include "common/logging/log.h"
#include "common/make_unique.h"
#include "common/math_util.h"
#include "core/file_sys/archive_backend.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_savedatacheck.h"
#include "core/file_sys/archive_sdmc.h"
#include "core/file_sys/archive_systemsavedata.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/fs/archive.h"
#include "core/hle/service/fs/fs_user.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.
// Workaroung for libstdc++ bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=60970

13
src/core/hle/service/fs/archive.h
Unescape Escape View File

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

2
src/core/hle/service/service.h
Unescape Escape View File

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