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 #5197 from leoetlino/ios-reset 

IOS: Don't expose HLE::Reset()
This commit is contained in:
Matthew Parlane 2017-04-03 21:26:01 +12:00 committed by GitHub
parent 3bd184a255 0dbad29bf4
commit 637bdc45b3
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Core/Core/HW/WII_IPC.cpp
View File

@ -139,7 +139,6 @@ void Reset()
{ {
INFO_LOG(WII_IPC, "Resetting ..."); INFO_LOG(WII_IPC, "Resetting ...");
InitState(); InitState();
HLE::Reset();
} }
void Shutdown() void Shutdown()

7
Source/Core/Core/IOS/IPC.cpp
View File

@ -631,7 +631,7 @@ void Init()
SetupMemory(IOS80_TITLE_ID, MemorySetupType::Full); SetupMemory(IOS80_TITLE_ID, MemorySetupType::Full);
} }
void Reset(const bool clear_devices) static void Reset()
{ {
CoreTiming::RemoveAllEvents(s_event_enqueue); CoreTiming::RemoveAllEvents(s_event_enqueue);
@ -644,7 +644,6 @@ void Reset(const bool clear_devices)
device.reset(); device.reset();
} }
if (clear_devices)
{ {
std::lock_guard<std::mutex> lock(s_device_map_mutex); std::lock_guard<std::mutex> lock(s_device_map_mutex);
s_device_map.clear(); s_device_map.clear();
@ -658,7 +657,7 @@ void Reset(const bool clear_devices)
void Shutdown() void Shutdown()
{ {
Reset(true); Reset();
} }
constexpr u64 BC_TITLE_ID = 0x0000000100000100; constexpr u64 BC_TITLE_ID = 0x0000000100000100;
@ -687,7 +686,7 @@ bool Reload(const u64 ios_title_id)
return false; return false;
s_active_title_id = ios_title_id; s_active_title_id = ios_title_id;
Reset(true); Reset();
if (ios_title_id == MIOS_TITLE_ID) if (ios_title_id == MIOS_TITLE_ID)
{ {

2
Source/Core/Core/IOS/IPC.h
View File

@ -52,8 +52,6 @@ enum IPCCommandType : u32
// Init events and devices // Init events and devices
void Init(); void Init();
// Reset all events and devices (and optionally clear them)
void Reset(bool clear_devices = false);
// Shutdown // Shutdown
void Shutdown(); void Shutdown();