diff options
| author | 2022-06-25 22:44:19 -0500 | |
|---|---|---|
| committer | 2022-06-26 20:21:37 -0500 | |
| commit | a7d9be13840acd65d0d684666390758ede72c826 (patch) | |
| tree | 37485f63b09576444173d6a765abe0bb95dd45db /src/core/hle/service/glue | |
| parent | Merge pull request #8475 from liamwhite/x18 (diff) | |
| download | yuzu-a7d9be13840acd65d0d684666390758ede72c826.tar.gz yuzu-a7d9be13840acd65d0d684666390758ede72c826.tar.xz yuzu-a7d9be13840acd65d0d684666390758ede72c826.zip | |
core: Replace all instances of ResultCode with Result
Diffstat (limited to 'src/core/hle/service/glue')
| -rw-r--r-- | src/core/hle/service/glue/arp.cpp | 2 | ||||
| -rw-r--r-- | src/core/hle/service/glue/errors.h | 8 | ||||
| -rw-r--r-- | src/core/hle/service/glue/glue_manager.cpp | 6 | ||||
| -rw-r--r-- | src/core/hle/service/glue/glue_manager.h | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/src/core/hle/service/glue/arp.cpp b/src/core/hle/service/glue/arp.cpp index fec7787ab..49b6d45fe 100644 --- a/src/core/hle/service/glue/arp.cpp +++ b/src/core/hle/service/glue/arp.cpp | |||
| @@ -153,7 +153,7 @@ class IRegistrar final : public ServiceFramework<IRegistrar> { | |||
| 153 | friend class ARP_W; | 153 | friend class ARP_W; |
| 154 | 154 | ||
| 155 | public: | 155 | public: |
| 156 | using IssuerFn = std::function<ResultCode(u64, ApplicationLaunchProperty, std::vector<u8>)>; | 156 | using IssuerFn = std::function<Result(u64, ApplicationLaunchProperty, std::vector<u8>)>; |
| 157 | 157 | ||
| 158 | explicit IRegistrar(Core::System& system_, IssuerFn&& issuer) | 158 | explicit IRegistrar(Core::System& system_, IssuerFn&& issuer) |
| 159 | : ServiceFramework{system_, "IRegistrar"}, issue_process_id{std::move(issuer)} { | 159 | : ServiceFramework{system_, "IRegistrar"}, issue_process_id{std::move(issuer)} { |
diff --git a/src/core/hle/service/glue/errors.h b/src/core/hle/service/glue/errors.h index aefbe1f3e..d4ce7f44e 100644 --- a/src/core/hle/service/glue/errors.h +++ b/src/core/hle/service/glue/errors.h | |||
| @@ -7,9 +7,9 @@ | |||
| 7 | 7 | ||
| 8 | namespace Service::Glue { | 8 | namespace Service::Glue { |
| 9 | 9 | ||
| 10 | constexpr ResultCode ERR_INVALID_RESOURCE{ErrorModule::ARP, 30}; | 10 | constexpr Result ERR_INVALID_RESOURCE{ErrorModule::ARP, 30}; |
| 11 | constexpr ResultCode ERR_INVALID_PROCESS_ID{ErrorModule::ARP, 31}; | 11 | constexpr Result ERR_INVALID_PROCESS_ID{ErrorModule::ARP, 31}; |
| 12 | constexpr ResultCode ERR_INVALID_ACCESS{ErrorModule::ARP, 42}; | 12 | constexpr Result ERR_INVALID_ACCESS{ErrorModule::ARP, 42}; |
| 13 | constexpr ResultCode ERR_NOT_REGISTERED{ErrorModule::ARP, 102}; | 13 | constexpr Result ERR_NOT_REGISTERED{ErrorModule::ARP, 102}; |
| 14 | 14 | ||
| 15 | } // namespace Service::Glue | 15 | } // namespace Service::Glue |
diff --git a/src/core/hle/service/glue/glue_manager.cpp b/src/core/hle/service/glue/glue_manager.cpp index f1655b33e..8a654cdca 100644 --- a/src/core/hle/service/glue/glue_manager.cpp +++ b/src/core/hle/service/glue/glue_manager.cpp | |||
| @@ -41,8 +41,8 @@ ResultVal<std::vector<u8>> ARPManager::GetControlProperty(u64 title_id) const { | |||
| 41 | return iter->second.control; | 41 | return iter->second.control; |
| 42 | } | 42 | } |
| 43 | 43 | ||
| 44 | ResultCode ARPManager::Register(u64 title_id, ApplicationLaunchProperty launch, | 44 | Result ARPManager::Register(u64 title_id, ApplicationLaunchProperty launch, |
| 45 | std::vector<u8> control) { | 45 | std::vector<u8> control) { |
| 46 | if (title_id == 0) { | 46 | if (title_id == 0) { |
| 47 | return ERR_INVALID_PROCESS_ID; | 47 | return ERR_INVALID_PROCESS_ID; |
| 48 | } | 48 | } |
| @@ -56,7 +56,7 @@ ResultCode ARPManager::Register(u64 title_id, ApplicationLaunchProperty launch, | |||
| 56 | return ResultSuccess; | 56 | return ResultSuccess; |
| 57 | } | 57 | } |
| 58 | 58 | ||
| 59 | ResultCode ARPManager::Unregister(u64 title_id) { | 59 | Result ARPManager::Unregister(u64 title_id) { |
| 60 | if (title_id == 0) { | 60 | if (title_id == 0) { |
| 61 | return ERR_INVALID_PROCESS_ID; | 61 | return ERR_INVALID_PROCESS_ID; |
| 62 | } | 62 | } |
diff --git a/src/core/hle/service/glue/glue_manager.h b/src/core/hle/service/glue/glue_manager.h index 6246fd2ff..cd0b092ac 100644 --- a/src/core/hle/service/glue/glue_manager.h +++ b/src/core/hle/service/glue/glue_manager.h | |||
| @@ -42,12 +42,12 @@ public: | |||
| 42 | // Adds a new entry to the internal database with the provided parameters, returning | 42 | // Adds a new entry to the internal database with the provided parameters, returning |
| 43 | // ERR_INVALID_ACCESS if attempting to re-register a title ID without an intermediate Unregister | 43 | // ERR_INVALID_ACCESS if attempting to re-register a title ID without an intermediate Unregister |
| 44 | // step, and ERR_INVALID_PROCESS_ID if the title ID is 0. | 44 | // step, and ERR_INVALID_PROCESS_ID if the title ID is 0. |
| 45 | ResultCode Register(u64 title_id, ApplicationLaunchProperty launch, std::vector<u8> control); | 45 | Result Register(u64 title_id, ApplicationLaunchProperty launch, std::vector<u8> control); |
| 46 | 46 | ||
| 47 | // Removes the registration for the provided title ID from the database, returning | 47 | // Removes the registration for the provided title ID from the database, returning |
| 48 | // ERR_NOT_REGISTERED if it doesn't exist in the database and ERR_INVALID_PROCESS_ID if the | 48 | // ERR_NOT_REGISTERED if it doesn't exist in the database and ERR_INVALID_PROCESS_ID if the |
| 49 | // title ID is 0. | 49 | // title ID is 0. |
| 50 | ResultCode Unregister(u64 title_id); | 50 | Result Unregister(u64 title_id); |
| 51 | 51 | ||
| 52 | // Removes all entries from the database, always succeeds. Should only be used when resetting | 52 | // Removes all entries from the database, always succeeds. Should only be used when resetting |
| 53 | // system state. | 53 | // system state. |