diff options
| author | 2014-05-18 18:24:24 -0400 | |
|---|---|---|
| committer | 2014-05-18 18:24:24 -0400 | |
| commit | 725d240bf7b9cb48de7a66f8696695ef7aabc889 (patch) | |
| tree | f9bbcff151b96109da675e00b23fb65c7a042f25 /src/core/hle/service/service.cpp | |
| parent | - moved Handle/Result definitions to kernel.h (diff) | |
| download | yuzu-725d240bf7b9cb48de7a66f8696695ef7aabc889.tar.gz yuzu-725d240bf7b9cb48de7a66f8696695ef7aabc889.tar.xz yuzu-725d240bf7b9cb48de7a66f8696695ef7aabc889.zip | |
renamed "UID" to "Handle" where appropriate
Diffstat (limited to 'src/core/hle/service/service.cpp')
| -rw-r--r-- | src/core/hle/service/service.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/core/hle/service/service.cpp b/src/core/hle/service/service.cpp index e6605a398..5601e59a1 100644 --- a/src/core/hle/service/service.cpp +++ b/src/core/hle/service/service.cpp | |||
| @@ -32,27 +32,27 @@ Manager::~Manager() { | |||
| 32 | /// Add a service to the manager (does not create it though) | 32 | /// Add a service to the manager (does not create it though) |
| 33 | void Manager::AddService(Interface* service) { | 33 | void Manager::AddService(Interface* service) { |
| 34 | int index = m_services.size(); | 34 | int index = m_services.size(); |
| 35 | u32 new_uid = GetUIDFromIndex(index); | 35 | Handle handle = GetHandleFromIndex(index); |
| 36 | 36 | ||
| 37 | m_services.push_back(service); | 37 | m_services.push_back(service); |
| 38 | 38 | ||
| 39 | m_port_map[service->GetPortName()] = new_uid; | 39 | m_port_map[service->GetPortName()] = handle; |
| 40 | service->m_uid = new_uid; | 40 | service->m_handle = handle; |
| 41 | } | 41 | } |
| 42 | 42 | ||
| 43 | /// Removes a service from the manager, also frees memory | 43 | /// Removes a service from the manager, also frees memory |
| 44 | void Manager::DeleteService(std::string port_name) { | 44 | void Manager::DeleteService(std::string port_name) { |
| 45 | auto service = FetchFromPortName(port_name); | 45 | auto service = FetchFromPortName(port_name); |
| 46 | 46 | ||
| 47 | m_services.erase(m_services.begin() + GetIndexFromUID(service->m_uid)); | 47 | m_services.erase(m_services.begin() + GetIndexFromHandle(service->m_handle)); |
| 48 | m_port_map.erase(port_name); | 48 | m_port_map.erase(port_name); |
| 49 | 49 | ||
| 50 | delete service; | 50 | delete service; |
| 51 | } | 51 | } |
| 52 | 52 | ||
| 53 | /// Get a Service Interface from its UID | 53 | /// Get a Service Interface from its Handle |
| 54 | Interface* Manager::FetchFromUID(u32 uid) { | 54 | Interface* Manager::FetchFromHandle(Handle handle) { |
| 55 | int index = GetIndexFromUID(uid); | 55 | int index = GetIndexFromHandle(handle); |
| 56 | if (index < (int)m_services.size()) { | 56 | if (index < (int)m_services.size()) { |
| 57 | return m_services[index]; | 57 | return m_services[index]; |
| 58 | } | 58 | } |
| @@ -65,7 +65,7 @@ Interface* Manager::FetchFromPortName(std::string port_name) { | |||
| 65 | if (itr == m_port_map.end()) { | 65 | if (itr == m_port_map.end()) { |
| 66 | return NULL; | 66 | return NULL; |
| 67 | } | 67 | } |
| 68 | return FetchFromUID(itr->second); | 68 | return FetchFromHandle(itr->second); |
| 69 | } | 69 | } |
| 70 | 70 | ||
| 71 | 71 | ||