diff options
author | Lioncash <mathew1800@gmail.com> | 2018-09-14 07:43:59 +0200 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2018-09-14 07:44:02 +0200 |
commit | da64da367b207a969fb00a8cbbc167a03bd57b4b (patch) | |
tree | 428058541eb60bed18d388accdb7d122ee8d0fc2 /src/core/hle/service | |
parent | Merge pull request #1308 from valentinvanelslande/ipc (diff) | |
download | yuzu-da64da367b207a969fb00a8cbbc167a03bd57b4b.tar yuzu-da64da367b207a969fb00a8cbbc167a03bd57b4b.tar.gz yuzu-da64da367b207a969fb00a8cbbc167a03bd57b4b.tar.bz2 yuzu-da64da367b207a969fb00a8cbbc167a03bd57b4b.tar.lz yuzu-da64da367b207a969fb00a8cbbc167a03bd57b4b.tar.xz yuzu-da64da367b207a969fb00a8cbbc167a03bd57b4b.tar.zst yuzu-da64da367b207a969fb00a8cbbc167a03bd57b4b.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hle/service/sm/sm.cpp | 8 | ||||
-rw-r--r-- | src/core/hle/service/sm/sm.h | 6 |
2 files changed, 6 insertions, 8 deletions
diff --git a/src/core/hle/service/sm/sm.cpp b/src/core/hle/service/sm/sm.cpp index 18d1641b8..096f0fd52 100644 --- a/src/core/hle/service/sm/sm.cpp +++ b/src/core/hle/service/sm/sm.cpp @@ -15,6 +15,10 @@ namespace Service::SM { +constexpr ResultCode ERR_ALREADY_REGISTERED(ErrorModule::SM, 4); +constexpr ResultCode ERR_INVALID_NAME(ErrorModule::SM, 6); +constexpr ResultCode ERR_SERVICE_NOT_REGISTERED(ErrorModule::SM, 7); + ServiceManager::ServiceManager() = default; ServiceManager::~ServiceManager() = default; @@ -24,10 +28,10 @@ void ServiceManager::InvokeControlRequest(Kernel::HLERequestContext& context) { static ResultCode ValidateServiceName(const std::string& name) { if (name.size() <= 0 || name.size() > 8) { - return ERR_INVALID_NAME_SIZE; + return ERR_INVALID_NAME; } if (name.find('\0') != std::string::npos) { - return ERR_NAME_CONTAINS_NUL; + return ERR_INVALID_NAME; } return RESULT_SUCCESS; } diff --git a/src/core/hle/service/sm/sm.h b/src/core/hle/service/sm/sm.h index a58d922a0..da2c51082 100644 --- a/src/core/hle/service/sm/sm.h +++ b/src/core/hle/service/sm/sm.h @@ -36,12 +36,6 @@ private: std::shared_ptr<ServiceManager> service_manager; }; -constexpr ResultCode ERR_SERVICE_NOT_REGISTERED(-1); -constexpr ResultCode ERR_MAX_CONNECTIONS_REACHED(-1); -constexpr ResultCode ERR_INVALID_NAME_SIZE(-1); -constexpr ResultCode ERR_NAME_CONTAINS_NUL(-1); -constexpr ResultCode ERR_ALREADY_REGISTERED(-1); - class ServiceManager { public: static void InstallInterfaces(std::shared_ptr<ServiceManager> self); |