ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9391 from lioncash/find-str 

IOS: Allow for heterogenous name lookup
This commit is contained in:
Léo Lam 2020-12-30 01:47:01 +01:00 committed by GitHub
parent 806a4f3a9a 0e91470828
commit 8a3b14d7dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/Core/IOS/IOS.cpp
View File

@ -409,7 +409,7 @@ bool Kernel::BootIOS(const u64 ios_title_id, const std::string& boot_content_pat
void Kernel::AddDevice(std::unique_ptr<Device::Device> device) void Kernel::AddDevice(std::unique_ptr<Device::Device> device)
{ {
ASSERT(device->GetDeviceType() == Device::Device::DeviceType::Static); ASSERT(device->GetDeviceType() == Device::Device::DeviceType::Static);
m_device_map[device->GetDeviceName()] = std::move(device); m_device_map.insert_or_assign(device->GetDeviceName(), std::move(device));
} }
void Kernel::AddCoreDevices() void Kernel::AddCoreDevices()
@ -505,14 +505,14 @@ s32 Kernel::GetFreeDeviceID()
return -1; return -1;
} }
std::shared_ptr<Device::Device> Kernel::GetDeviceByName(const std::string& device_name) std::shared_ptr<Device::Device> Kernel::GetDeviceByName(std::string_view device_name)
{ {
std::lock_guard lock(m_device_map_mutex); std::lock_guard lock(m_device_map_mutex);
const auto iterator = m_device_map.find(device_name); const auto iterator = m_device_map.find(device_name);
return iterator != m_device_map.end() ? iterator->second : nullptr; return iterator != m_device_map.end() ? iterator->second : nullptr;
} }
std::shared_ptr<Device::Device> EmulationKernel::GetDeviceByName(const std::string& device_name) std::shared_ptr<Device::Device> EmulationKernel::GetDeviceByName(std::string_view device_name)
{ {
return Kernel::GetDeviceByName(device_name); return Kernel::GetDeviceByName(device_name);
} }

7
Source/Core/Core/IOS/IOS.h
View File

@ -10,6 +10,7 @@
#include <memory> #include <memory>
#include <mutex> #include <mutex>
#include <string> #include <string>
#include <string_view>
#include <vector> #include <vector>
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
@ -110,14 +111,14 @@ protected:
void AddDevice(std::unique_ptr<Device::Device> device); void AddDevice(std::unique_ptr<Device::Device> device);
void AddCoreDevices(); void AddCoreDevices();
void AddStaticDevices(); void AddStaticDevices();
std::shared_ptr<Device::Device> GetDeviceByName(const std::string& device_name); std::shared_ptr<Device::Device> GetDeviceByName(std::string_view device_name);
s32 GetFreeDeviceID(); s32 GetFreeDeviceID();
IPCCommandResult OpenDevice(OpenRequest& request); IPCCommandResult OpenDevice(OpenRequest& request);
bool m_is_responsible_for_nand_root = false; bool m_is_responsible_for_nand_root = false;
u64 m_title_id = 0; u64 m_title_id = 0;
static constexpr u8 IPC_MAX_FDS = 0x18; static constexpr u8 IPC_MAX_FDS = 0x18;
std::map<std::string, std::shared_ptr<Device::Device>> m_device_map; std::map<std::string, std::shared_ptr<Device::Device>, std::less<>> m_device_map;
std::mutex m_device_map_mutex; std::mutex m_device_map_mutex;
// TODO: make this fdmap per process. // TODO: make this fdmap per process.
std::array<std::shared_ptr<Device::Device>, IPC_MAX_FDS> m_fdmap; std::array<std::shared_ptr<Device::Device>, IPC_MAX_FDS> m_fdmap;
@ -144,7 +145,7 @@ public:
// Get a resource manager by name. // Get a resource manager by name.
// This only works for devices which are part of the device map. // This only works for devices which are part of the device map.
std::shared_ptr<Device::Device> GetDeviceByName(const std::string& device_name); std::shared_ptr<Device::Device> GetDeviceByName(std::string_view device_name);
}; };
// Used for controlling and accessing an IOS instance that is tied to emulation. // Used for controlling and accessing an IOS instance that is tied to emulation.