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

IOS HLE: Simplify Reset() and SetDefaultContentFile() 

Reset():
We only need to close IOS devices which were opened, and we can do that
simply by iterating over s_fdmap and closing any opened device.
With this change, s_device_map can be cleared at once.

SetDefaultContentFile():
We can just use s_es_handles which is guaranteed to contain three valid
ES devices. Gets rid of a downcast.
This commit is contained in:
Léo Lam 2017-01-11 14:47:02 +01:00
parent f82d6c6fe1
commit 36c4dda4ed
1 changed files with 12 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Source/Core/Core/IPC_HLE/WII_IPC_HLE.cpp
View File

@ -67,7 +67,7 @@ static std::mutex s_device_map_mutex;
constexpr u8 IPC_MAX_FDS = 0x18; constexpr u8 IPC_MAX_FDS = 0x18;
constexpr u8 ES_MAX_COUNT = 3; constexpr u8 ES_MAX_COUNT = 3;
static std::shared_ptr<IWII_IPC_HLE_Device> s_fdmap[IPC_MAX_FDS]; static std::shared_ptr<IWII_IPC_HLE_Device> s_fdmap[IPC_MAX_FDS];
static std::shared_ptr<IWII_IPC_HLE_Device> s_es_handles[ES_MAX_COUNT]; static std::shared_ptr<CWII_IPC_HLE_Device_es> s_es_handles[ES_MAX_COUNT];
using IPCMsgQueue = std::deque<u32>; using IPCMsgQueue = std::deque<u32>;
static IPCMsgQueue s_request_queue; // ppc -> arm static IPCMsgQueue s_request_queue; // ppc -> arm
@ -171,30 +171,19 @@ void Reset(bool hard)
{ {
CoreTiming::RemoveAllEvents(s_event_enqueue); CoreTiming::RemoveAllEvents(s_event_enqueue);
for (auto& dev : s_fdmap) // Close all devices that were opened and delete their resources
for (auto& device : s_fdmap)
{ {
if (dev && dev->GetDeviceType() != IWII_IPC_HLE_Device::DeviceType::Static) if (!device)
{ continue;
// close all files and delete their resources device->Close(0, true);
dev->Close(0, true); device.reset();
}
dev.reset();
} }
if (hard)
{ {
std::lock_guard<std::mutex> lock(s_device_map_mutex); std::lock_guard<std::mutex> lock(s_device_map_mutex);
for (const auto& entry : s_device_map) s_device_map.clear();
{
if (entry.second)
{
// Force close
entry.second->Close(0, true);
}
}
if (hard)
s_device_map.clear();
} }
s_request_queue.clear(); s_request_queue.clear();
@ -211,13 +200,8 @@ void Shutdown()
void SetDefaultContentFile(const std::string& file_name) void SetDefaultContentFile(const std::string& file_name)
{ {
std::lock_guard<std::mutex> lock(s_device_map_mutex); std::lock_guard<std::mutex> lock(s_device_map_mutex);
for (const auto& entry : s_device_map) for (const auto& es : s_es_handles)
{ es->LoadWAD(file_name);
if (entry.second && entry.second->GetDeviceName().find("/dev/es") == 0)
{
static_cast<CWII_IPC_HLE_Device_es*>(entry.second.get())->LoadWAD(file_name);
}
}
} }
void ES_DIVerify(const std::vector<u8>& tmd) void ES_DIVerify(const std::vector<u8>& tmd)
@ -319,7 +303,7 @@ void DoState(PointerWrap& p)
{ {
const u32 handle_id = es_device->GetDeviceID(); const u32 handle_id = es_device->GetDeviceID();
p.Do(handle_id); p.Do(handle_id);
es_device = AccessDeviceByID(handle_id); es_device = std::static_pointer_cast<CWII_IPC_HLE_Device_es>(AccessDeviceByID(handle_id));
} }
} }
else else