summaryrefslogtreecommitdiffstats
path: root/src/core/hle/service/glue
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/core/hle/service/glue/arp.cpp2
-rw-r--r--src/core/hle/service/glue/glue_manager.cpp78
-rw-r--r--src/core/hle/service/glue/glue_manager.h (renamed from src/core/hle/service/glue/manager.h)0
-rw-r--r--src/core/hle/service/glue/manager.cpp78
4 files changed, 79 insertions, 79 deletions
diff --git a/src/core/hle/service/glue/arp.cpp b/src/core/hle/service/glue/arp.cpp
index ca25df67e..5a3b54cc1 100644
--- a/src/core/hle/service/glue/arp.cpp
+++ b/src/core/hle/service/glue/arp.cpp
@@ -13,7 +13,7 @@
#include "core/hle/kernel/kernel.h"
#include "core/hle/service/glue/arp.h"
#include "core/hle/service/glue/errors.h"
-#include "core/hle/service/glue/manager.h"
+#include "core/hle/service/glue/glue_manager.h"
#include "core/hle/service/service.h"
namespace Service::Glue {
diff --git a/src/core/hle/service/glue/glue_manager.cpp b/src/core/hle/service/glue/glue_manager.cpp
new file mode 100644
index 000000000..aa9d48c0c
--- /dev/null
+++ b/src/core/hle/service/glue/glue_manager.cpp
@@ -0,0 +1,78 @@
+// Copyright 2019 yuzu emulator team
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.
+
+#include "core/hle/service/glue/errors.h"
+#include "core/hle/service/glue/glue_manager.h"
+
+namespace Service::Glue {
+
+struct ARPManager::MapEntry {
+ ApplicationLaunchProperty launch;
+ std::vector<u8> control;
+};
+
+ARPManager::ARPManager() = default;
+
+ARPManager::~ARPManager() = default;
+
+ResultVal<ApplicationLaunchProperty> ARPManager::GetLaunchProperty(u64 title_id) const {
+ if (title_id == 0) {
+ return ERR_INVALID_PROCESS_ID;
+ }
+
+ const auto iter = entries.find(title_id);
+ if (iter == entries.end()) {
+ return ERR_NOT_REGISTERED;
+ }
+
+ return MakeResult<ApplicationLaunchProperty>(iter->second.launch);
+}
+
+ResultVal<std::vector<u8>> ARPManager::GetControlProperty(u64 title_id) const {
+ if (title_id == 0) {
+ return ERR_INVALID_PROCESS_ID;
+ }
+
+ const auto iter = entries.find(title_id);
+ if (iter == entries.end()) {
+ return ERR_NOT_REGISTERED;
+ }
+
+ return MakeResult<std::vector<u8>>(iter->second.control);
+}
+
+ResultCode ARPManager::Register(u64 title_id, ApplicationLaunchProperty launch,
+ std::vector<u8> control) {
+ if (title_id == 0) {
+ return ERR_INVALID_PROCESS_ID;
+ }
+
+ const auto iter = entries.find(title_id);
+ if (iter != entries.end()) {
+ return ERR_INVALID_ACCESS;
+ }
+
+ entries.insert_or_assign(title_id, MapEntry{launch, std::move(control)});
+ return ResultSuccess;
+}
+
+ResultCode ARPManager::Unregister(u64 title_id) {
+ if (title_id == 0) {
+ return ERR_INVALID_PROCESS_ID;
+ }
+
+ const auto iter = entries.find(title_id);
+ if (iter == entries.end()) {
+ return ERR_NOT_REGISTERED;
+ }
+
+ entries.erase(iter);
+ return ResultSuccess;
+}
+
+void ARPManager::ResetAll() {
+ entries.clear();
+}
+
+} // namespace Service::Glue
diff --git a/src/core/hle/service/glue/manager.h b/src/core/hle/service/glue/glue_manager.h
index a7f5ce3ee..a7f5ce3ee 100644
--- a/src/core/hle/service/glue/manager.h
+++ b/src/core/hle/service/glue/glue_manager.h
diff --git a/src/core/hle/service/glue/manager.cpp b/src/core/hle/service/glue/manager.cpp
deleted file mode 100644
index 9b1754cf8..000000000
--- a/src/core/hle/service/glue/manager.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-// Copyright 2019 yuzu emulator team
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included.
-
-#include "core/hle/service/glue/errors.h"
-#include "core/hle/service/glue/manager.h"
-
-namespace Service::Glue {
-
-struct ARPManager::MapEntry {
- ApplicationLaunchProperty launch;
- std::vector<u8> control;
-};
-
-ARPManager::ARPManager() = default;
-
-ARPManager::~ARPManager() = default;
-
-ResultVal<ApplicationLaunchProperty> ARPManager::GetLaunchProperty(u64 title_id) const {
- if (title_id == 0) {
- return ERR_INVALID_PROCESS_ID;
- }
-
- const auto iter = entries.find(title_id);
- if (iter == entries.end()) {
- return ERR_NOT_REGISTERED;
- }
-
- return MakeResult<ApplicationLaunchProperty>(iter->second.launch);
-}
-
-ResultVal<std::vector<u8>> ARPManager::GetControlProperty(u64 title_id) const {
- if (title_id == 0) {
- return ERR_INVALID_PROCESS_ID;
- }
-
- const auto iter = entries.find(title_id);
- if (iter == entries.end()) {
- return ERR_NOT_REGISTERED;
- }
-
- return MakeResult<std::vector<u8>>(iter->second.control);
-}
-
-ResultCode ARPManager::Register(u64 title_id, ApplicationLaunchProperty launch,
- std::vector<u8> control) {
- if (title_id == 0) {
- return ERR_INVALID_PROCESS_ID;
- }
-
- const auto iter = entries.find(title_id);
- if (iter != entries.end()) {
- return ERR_INVALID_ACCESS;
- }
-
- entries.insert_or_assign(title_id, MapEntry{launch, std::move(control)});
- return ResultSuccess;
-}
-
-ResultCode ARPManager::Unregister(u64 title_id) {
- if (title_id == 0) {
- return ERR_INVALID_PROCESS_ID;
- }
-
- const auto iter = entries.find(title_id);
- if (iter == entries.end()) {
- return ERR_NOT_REGISTERED;
- }
-
- entries.erase(iter);
- return ResultSuccess;
-}
-
-void ARPManager::ResetAll() {
- entries.clear();
-}
-
-} // namespace Service::Glue