CCF_100/citra
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

HLE: Move SessionRequestHandler from Service:: to Kernel::

Browse Source 
Most of the code that works with this is or will be in the kernel, so
it's a more appropriate place for it to be.
This commit is contained in:
Yuri Kunde Schlesner
2017-06-04 21:52:19 -07:00
parent 8f0a23b631
commit e626a520ca
14 changed files with 100 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/core/hle/service/fs/archive.cpp
View File

@@ -25,6 +25,7 @@
#include "core/file_sys/errors.h"
#include "core/file_sys/file_backend.h"
#include "core/hle/kernel/client_session.h"
#include "core/hle/kernel/server_session.h"
#include "core/hle/result.h"
#include "core/hle/service/fs/archive.h"
#include "core/hle/service/fs/fs_user.h"

6
src/core/hle/service/fs/archive.h
View File

@@ -8,7 +8,7 @@
#include <string>
#include "common/common_types.h"
#include "core/file_sys/archive_backend.h"
#include "core/hle/kernel/server_session.h"
#include "core/hle/kernel/hle_ipc.h"
#include "core/hle/result.h"
namespace FileSys {
@@ -43,7 +43,7 @@ enum class MediaType : u32 { NAND = 0, SDMC = 1, GameCard = 2 };
typedef u64 ArchiveHandle;
class File final : public SessionRequestHandler, public std::enable_shared_from_this<File> {
class File final : public Kernel::SessionRequestHandler, public std::enable_shared_from_this<File> {
public:
File(std::unique_ptr<FileSys::FileBackend>&& backend, const FileSys::Path& path);
~File();
@@ -60,7 +60,7 @@ protected:
void HandleSyncRequest(Kernel::SharedPtr<Kernel::ServerSession> server_session) override;
};
class Directory final : public SessionRequestHandler {
class Directory final : public Kernel::SessionRequestHandler {
public:
Directory(std::unique_ptr<FileSys::DirectoryBackend>&& backend, const FileSys::Path& path);
~Directory();

1
src/core/hle/service/fs/fs_user.cpp
View File

@@ -11,6 +11,7 @@
#include "core/core.h"
#include "core/file_sys/errors.h"
#include "core/hle/kernel/client_session.h"
#include "core/hle/kernel/server_session.h"
#include "core/hle/result.h"
#include "core/hle/service/fs/archive.h"
#include "core/hle/service/fs/fs_user.h"