diff options
| author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2014-12-14 07:32:45 +0100 |
|---|---|---|
| committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2014-12-16 04:08:14 +0100 |
| commit | c72ccfa6db41039ef2eb0ce118fabe1b38da841e (patch) | |
| tree | 42f766bc8ab77ae6d469c82e9d9ca729135b56a7 /src/core/hle | |
| parent | Switch to C++14 to use std::make_unique (diff) | |
| download | yuzu-c72ccfa6db41039ef2eb0ce118fabe1b38da841e.tar yuzu-c72ccfa6db41039ef2eb0ce118fabe1b38da841e.tar.gz yuzu-c72ccfa6db41039ef2eb0ce118fabe1b38da841e.tar.bz2 yuzu-c72ccfa6db41039ef2eb0ce118fabe1b38da841e.tar.lz yuzu-c72ccfa6db41039ef2eb0ce118fabe1b38da841e.tar.xz yuzu-c72ccfa6db41039ef2eb0ce118fabe1b38da841e.tar.zst yuzu-c72ccfa6db41039ef2eb0ce118fabe1b38da841e.zip | |
Diffstat (limited to 'src/core/hle')
| -rw-r--r-- | src/core/hle/kernel/kernel.cpp | 2 | ||||
| -rw-r--r-- | src/core/hle/service/fs/archive.cpp (renamed from src/core/hle/kernel/archive.cpp) | 2 | ||||
| -rw-r--r-- | src/core/hle/service/fs/archive.h (renamed from src/core/hle/kernel/archive.h) | 0 | ||||
| -rw-r--r-- | src/core/hle/service/fs/fs_user.cpp (renamed from src/core/hle/service/fs_user.cpp) | 5 | ||||
| -rw-r--r-- | src/core/hle/service/fs/fs_user.h (renamed from src/core/hle/service/fs_user.h) | 0 | ||||
| -rw-r--r-- | src/core/hle/service/service.cpp | 2 |
6 files changed, 5 insertions, 6 deletions
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index b38be0a49..95b4dfd68 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp @@ -9,7 +9,7 @@ #include "core/core.h" #include "core/hle/kernel/kernel.h" #include "core/hle/kernel/thread.h" -#include "core/hle/kernel/archive.h" +#include "core/hle/service/fs/archive.h" namespace Kernel { diff --git a/src/core/hle/kernel/archive.cpp b/src/core/hle/service/fs/archive.cpp index 0e3eb4564..8889c6339 100644 --- a/src/core/hle/kernel/archive.cpp +++ b/src/core/hle/service/fs/archive.cpp @@ -11,7 +11,7 @@ #include "core/file_sys/archive.h" #include "core/file_sys/archive_sdmc.h" #include "core/file_sys/directory.h" -#include "core/hle/kernel/archive.h" +#include "core/hle/service/fs/archive.h" #include "core/hle/kernel/session.h" #include "core/hle/result.h" diff --git a/src/core/hle/kernel/archive.h b/src/core/hle/service/fs/archive.h index b50833a2b..b50833a2b 100644 --- a/src/core/hle/kernel/archive.h +++ b/src/core/hle/service/fs/archive.h diff --git a/src/core/hle/service/fs_user.cpp b/src/core/hle/service/fs/fs_user.cpp index 672ba2475..c61b283c9 100644 --- a/src/core/hle/service/fs_user.cpp +++ b/src/core/hle/service/fs/fs_user.cpp @@ -5,10 +5,9 @@ #include "common/common.h" #include "common/string_util.h" -#include "core/hle/kernel/archive.h" -#include "core/hle/kernel/archive.h" +#include "core/hle/service/fs/archive.h" #include "core/hle/result.h" -#include "core/hle/service/fs_user.h" +#include "core/hle/service/fs/fs_user.h" #include "core/settings.h" //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/core/hle/service/fs_user.h b/src/core/hle/service/fs/fs_user.h index 005382540..005382540 100644 --- a/src/core/hle/service/fs_user.h +++ b/src/core/hle/service/fs/fs_user.h diff --git a/src/core/hle/service/service.cpp b/src/core/hle/service/service.cpp index e6973572b..68d199acc 100644 --- a/src/core/hle/service/service.cpp +++ b/src/core/hle/service/service.cpp @@ -15,7 +15,7 @@ #include "core/hle/service/csnd_snd.h" #include "core/hle/service/dsp_dsp.h" #include "core/hle/service/err_f.h" -#include "core/hle/service/fs_user.h" +#include "core/hle/service/fs/fs_user.h" #include "core/hle/service/frd_u.h" #include "core/hle/service/gsp_gpu.h" #include "core/hle/service/hid_user.h" |