The-Homebrew-Cloud/skyline
2
0
Fork 0
mirror of https://github.com/skyline-emu/skyline.git synced 2024-12-23 08:51:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Refactor filesystem services

Browse Source 
Use the new service naming convention.
This commit is contained in:
Billy Laws 2020-02-16 20:05:22 +00:00 committed by ◱ PixelyIon
parent 524cd26649
commit 644cfbe332
8 changed files with 59 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/CMakeLists.txt
View File

@ -66,7 +66,8 @@ add_library(skyline SHARED
${source_DIR}/skyline/services/timesrv/IStaticService.cpp
${source_DIR}/skyline/services/timesrv/ISystemClock.cpp
${source_DIR}/skyline/services/timesrv/ITimeZoneService.cpp
${source_DIR}/skyline/services/fs/fs.cpp
${source_DIR}/skyline/services/fssrv/IFileSystemProxy.cpp
${source_DIR}/skyline/services/fssrv/IFileSystem.cpp
${source_DIR}/skyline/services/nvdrv/nvdrv.cpp
${source_DIR}/skyline/services/nvnflinger/dispdrv.cpp
${source_DIR}/skyline/services/vi/vi_m.cpp

6
app/src/main/cpp/skyline/services/base_service.h
View File

@ -47,8 +47,8 @@ namespace skyline::service {
timesrv_IStaticService,
timesrv_ISystemClock,
timesrv_ITimeZoneService,
fs_fsp,
fs_IFileSystem,
fssrv_IFileSystemProxy,
fssrv_IFileSystem,
nvdrv,
vi_m,
vi_IApplicationDisplayService,
@ -72,7 +72,7 @@ namespace skyline::service {
{"time:s", Service::timesrv_IStaticService},
{"time:a", Service::timesrv_IStaticService},
{"time:u", Service::timesrv_IStaticService},
{"fsp-srv", Service::fs_fsp},
{"fsp-srv", Service::fssrv_IFileSystemProxy},
{"nvdrv", Service::nvdrv},
{"nvdrv:a", Service::nvdrv},
{"nvdrv:s", Service::nvdrv},

18
app/src/main/cpp/skyline/services/fs/fs.cpp
View File

@ -1,18 +0,0 @@
#include "fs.h"
namespace skyline::service::fs {
fsp::fsp(const DeviceState &state, ServiceManager &manager) : BaseService(state, manager, Service::fs_fsp, "fs:fsp", {
{0x1, SFUNC(fsp::SetCurrentProcess)},
{0x12, SFUNC(fsp::OpenSdCardFileSystem)}
}) {}
void fsp::SetCurrentProcess(type::KSession &session, ipc::IpcRequest &request, ipc::IpcResponse &response) {
process = *reinterpret_cast<pid_t *>(request.cmdArg);
}
void fsp::OpenSdCardFileSystem(type::KSession &session, ipc::IpcRequest &request, ipc::IpcResponse &response) {
manager.RegisterService(std::make_shared<IFileSystem>(FsType::SdCard, state, manager), session, response);
}
IFileSystem::IFileSystem(FsType type, const DeviceState &state, ServiceManager &manager) : type(type), BaseService(state, manager, Service::fs_IFileSystem, "fs:IFileSystem", {}) {}
}

5
app/src/main/cpp/skyline/services/fssrv/IFileSystem.cpp Normal file
View File

@ -0,0 +1,5 @@
#include "IFileSystem.h"
namespace skyline::service::fssrv {
IFileSystem::IFileSystem(const FsType type, const DeviceState &state, ServiceManager &manager) : type(type), BaseService(state, manager, Service::fssrv_IFileSystem, "fssrv:IFileSystem", {}) {}
}

25
app/src/main/cpp/skyline/services/fssrv/IFileSystem.h Normal file
View File

@ -0,0 +1,25 @@
#pragma once
#include <services/base_service.h>
#include <services/serviceman.h>
namespace skyline::service::fssrv {
/**
* @brief These are the possible types of the filesystem
*/
enum class FsType {
Nand,
SdCard,
GameCard
};
/**
* @brief IFileSystem is used to interact with a filesystem (https://switchbrew.org/wiki/Filesystem_services#IFileSystem)
*/
class IFileSystem : public BaseService {
public:
const FsType type;
IFileSystem(FsType type, const DeviceState &state, ServiceManager &manager);
};
}

16
app/src/main/cpp/skyline/services/fssrv/IFileSystemProxy.cpp Normal file
View File

@ -0,0 +1,16 @@
#include "IFileSystemProxy.h"
namespace skyline::service::fssrv {
IFileSystemProxy::IFileSystemProxy(const DeviceState &state, ServiceManager &manager) : BaseService(state, manager, Service::fssrv_IFileSystemProxy, "fssrv:IFileSystemProxy", {
{0x1, SFUNC(IFileSystemProxy::SetCurrentProcess)},
{0x12, SFUNC(IFileSystemProxy::OpenSdCardFileSystem)}
}) {}
void IFileSystemProxy::SetCurrentProcess(type::KSession &session, ipc::IpcRequest &request, ipc::IpcResponse &response) {
process = *reinterpret_cast<pid_t *>(request.cmdArg);
}
void IFileSystemProxy::OpenSdCardFileSystem(type::KSession &session, ipc::IpcRequest &request, ipc::IpcResponse &response) {
manager.RegisterService(std::make_shared<IFileSystem>(FsType::SdCard, state, manager), session, response);
}
}

28
app/src/main/cpp/skyline/services/fs/fs.h → app/src/main/cpp/skyline/services/fssrv/IFileSystemProxy.h
View File

@ -2,25 +2,17 @@
#include <services/base_service.h>
#include <services/serviceman.h>
#include "IFileSystem.h"
namespace skyline::service::fs {
namespace skyline::service::fssrv {
/**
* @brief These are the possible types of the filesystem
* @brief IFileSystemProxy or fsp-srv is responsible for providing handles to file systems (https://switchbrew.org/wiki/Filesystem_services#fsp-srv)
*/
enum class FsType {
Nand,
SdCard,
GameCard
};
/**
* @brief fsp-srv or IFileSystemProxy is responsible for providing handles to file systems (https://switchbrew.org/wiki/Filesystem_services#fsp-srv)
*/
class fsp : public BaseService {
class IFileSystemProxy : public BaseService {
public:
pid_t process{}; //!< This holds the PID set by SetCurrentProcess
fsp(const DeviceState &state, ServiceManager &manager);
IFileSystemProxy(const DeviceState &state, ServiceManager &manager);
/**
* @brief This sets the PID of the process using FS currently (https://switchbrew.org/wiki/Filesystem_services#SetCurrentProcess)
@ -32,14 +24,4 @@ namespace skyline::service::fs {
*/
void OpenSdCardFileSystem(type::KSession &session, ipc::IpcRequest &request, ipc::IpcResponse &response);
};
/**
* @brief IFileSystem is used to interact with a filesystem (https://switchbrew.org/wiki/Filesystem_services#IFileSystem)
*/
class IFileSystem : public BaseService {
public:
FsType type;
IFileSystem(FsType type, const DeviceState &state, ServiceManager &manager);
};
}

6
app/src/main/cpp/skyline/services/serviceman.cpp
View File

@ -9,7 +9,7 @@
#include "fatal/fatal.h"
#include "hid/IHidServer.h"
#include "timesrv/IStaticService.h"
#include "fs/fs.h"
#include "fssrv/IFileSystemProxy.h"
#include "nvdrv/nvdrv.h"
#include "vi/vi_m.h"
#include "serviceman.h"
@ -53,8 +53,8 @@ namespace skyline::service {
case Service::timesrv_IStaticService:
serviceObj = std::make_shared<timesrv::IStaticService>(state, *this);
break;
case Service::fs_fsp:
serviceObj = std::make_shared<fs::fsp>(state, *this);
case Service::fssrv_IFileSystemProxy:
serviceObj = std::make_shared<fssrv::IFileSystemProxy>(state, *this);
break;
case Service::nvdrv:
serviceObj = std::make_shared<nvdrv::nvdrv>(state, *this);