The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-03-12 14:46:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #107 from lioncash/tiny-cleanup

Browse Source 
Tiny cleanup of WII_IPC_HLE.cpp.
This commit is contained in:
Tony Wasserka 2014-02-26 12:46:49 +01:00
commit 66d1f16f98
1 changed files with 34 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -90,7 +90,6 @@ void EnqueReplyCallback(u64 userdata, int)
void Init() void Init()
{ {
_dbg_assert_msg_(WII_IPC_HLE, g_DeviceMap.empty(), "DeviceMap isn't empty on init"); _dbg_assert_msg_(WII_IPC_HLE, g_DeviceMap.empty(), "DeviceMap isn't empty on init");
CWII_IPC_HLE_Device_es::m_ContentFile = ""; CWII_IPC_HLE_Device_es::m_ContentFile = "";
u32 i; u32 i;
@ -107,8 +106,7 @@ void Init()
g_DeviceMap[i] = new CWII_IPC_HLE_Device_fs(i, std::string("/dev/fs")); i++; g_DeviceMap[i] = new CWII_IPC_HLE_Device_fs(i, std::string("/dev/fs")); i++;
// IOS allows two ES devices at a time< // IOS allows two ES devices at a time<
u32 j; for (u32 j=0; j<ES_MAX_COUNT; j++)
for (j=0; j<ES_MAX_COUNT; j++)
{ {
g_DeviceMap[i] = es_handles[j] = new CWII_IPC_HLE_Device_es(i, std::string("/dev/es")); i++; g_DeviceMap[i] = es_handles[j] = new CWII_IPC_HLE_Device_es(i, std::string("/dev/es")); i++;
es_inuse[j] = false; es_inuse[j] = false;
@ -124,10 +122,10 @@ void Init()
g_DeviceMap[i] = new CWII_IPC_HLE_Device_usb_kbd(i, std::string("/dev/usb/kbd")); i++; g_DeviceMap[i] = new CWII_IPC_HLE_Device_usb_kbd(i, std::string("/dev/usb/kbd")); i++;
g_DeviceMap[i] = new CWII_IPC_HLE_Device_sdio_slot0(i, std::string("/dev/sdio/slot0")); i++; g_DeviceMap[i] = new CWII_IPC_HLE_Device_sdio_slot0(i, std::string("/dev/sdio/slot0")); i++;
g_DeviceMap[i] = new CWII_IPC_HLE_Device_stub(i, std::string("/dev/sdio/slot1")); i++; g_DeviceMap[i] = new CWII_IPC_HLE_Device_stub(i, std::string("/dev/sdio/slot1")); i++;
#if defined(__LIBUSB__) || defined(_WIN32) #if defined(__LIBUSB__) || defined(_WIN32)
g_DeviceMap[i] = new CWII_IPC_HLE_Device_hid(i, std::string("/dev/usb/hid")); i++; g_DeviceMap[i] = new CWII_IPC_HLE_Device_hid(i, std::string("/dev/usb/hid")); i++;
#else #else
g_DeviceMap[i] = new CWII_IPC_HLE_Device_stub(i, std::string("/dev/usb/hid")); i++; g_DeviceMap[i] = new CWII_IPC_HLE_Device_stub(i, std::string("/dev/usb/hid")); i++;
#endif #endif
g_DeviceMap[i] = new CWII_IPC_HLE_Device_stub(i, std::string("/dev/usb/oh1")); i++; g_DeviceMap[i] = new CWII_IPC_HLE_Device_stub(i, std::string("/dev/usb/oh1")); i++;
g_DeviceMap[i] = new IWII_IPC_HLE_Device(i, std::string("_Unimplemented_Device_")); i++; g_DeviceMap[i] = new IWII_IPC_HLE_Device(i, std::string("_Unimplemented_Device_")); i++;
@ -139,8 +137,7 @@ void Reset(bool _bHard)
{ {
CoreTiming::RemoveAllEvents(enque_reply); CoreTiming::RemoveAllEvents(enque_reply);
u32 i; for (u32 i=0; i<IPC_MAX_FDS; i++)
for (i=0; i<IPC_MAX_FDS; i++)
{ {
if (g_FdMap[i] != NULL && !g_FdMap[i]->IsHardware()) if (g_FdMap[i] != NULL && !g_FdMap[i]->IsHardware())
{ {
@ -148,28 +145,28 @@ void Reset(bool _bHard)
g_FdMap[i]->Close(0, true); g_FdMap[i]->Close(0, true);
delete g_FdMap[i]; delete g_FdMap[i];
} }
g_FdMap[i] = NULL; g_FdMap[i] = NULL;
} }
u32 j; for (u32 j=0; j<ES_MAX_COUNT; j++)
for (j=0; j<ES_MAX_COUNT; j++)
{ {
es_inuse[j] = false; es_inuse[j] = false;
} }
TDeviceMap::iterator itr = g_DeviceMap.begin(); for (const auto& entry : g_DeviceMap)
while (itr != g_DeviceMap.end())
{ {
if (itr->second) if (entry.second)
{ {
// Force close // Force close
itr->second->Close(0, true); entry.second->Close(0, true);
// Hardware should not be deleted unless it is a hard reset // Hardware should not be deleted unless it is a hard reset
if (_bHard) if (_bHard)
delete itr->second; delete entry.second;
} }
++itr;
} }
if (_bHard) if (_bHard)
{ {
g_DeviceMap.erase(g_DeviceMap.begin(), g_DeviceMap.end()); g_DeviceMap.erase(g_DeviceMap.begin(), g_DeviceMap.end());
@ -191,14 +188,12 @@ void Shutdown()
void SetDefaultContentFile(const std::string& _rFilename) void SetDefaultContentFile(const std::string& _rFilename)
{ {
TDeviceMap::const_iterator itr = g_DeviceMap.begin(); for (const auto& entry : g_DeviceMap)
while (itr != g_DeviceMap.end())
{ {
if (itr->second && itr->second->GetDeviceName().find(std::string("/dev/es")) == 0) if (entry.second && entry.second->GetDeviceName().find(std::string("/dev/es")) == 0)
{ {
((CWII_IPC_HLE_Device_es*)itr->second)->LoadWAD(_rFilename); ((CWII_IPC_HLE_Device_es*)entry.second)->LoadWAD(_rFilename);
} }
++itr;
} }
} }
@ -214,27 +209,26 @@ void SDIO_EventNotify()
if (pDevice) if (pDevice)
pDevice->EventNotify(); pDevice->EventNotify();
} }
int getFreeDeviceId() int getFreeDeviceId()
{ {
u32 i; for (u32 i=0; i<IPC_MAX_FDS; i++)
for (i=0; i<IPC_MAX_FDS; i++)
{ {
if (g_FdMap[i] == NULL) if (g_FdMap[i] == NULL)
{ {
return i; return i;
} }
} }
return -1; return -1;
} }
IWII_IPC_HLE_Device* GetDeviceByName(const std::string& _rDeviceName) IWII_IPC_HLE_Device* GetDeviceByName(const std::string& _rDeviceName)
{ {
TDeviceMap::const_iterator itr = g_DeviceMap.begin(); for (const auto& entry : g_DeviceMap)
while (itr != g_DeviceMap.end())
{ {
if (itr->second && itr->second->GetDeviceName() == _rDeviceName) if (entry.second && entry.second->GetDeviceName() == _rDeviceName)
return itr->second; return entry.second;
++itr;
} }
return NULL; return NULL;
@ -269,22 +263,17 @@ void DoState(PointerWrap &p)
p.Do(reply_queue); p.Do(reply_queue);
p.Do(last_reply_time); p.Do(last_reply_time);
TDeviceMap::const_iterator itr; for (const auto& entry : g_DeviceMap)
itr = g_DeviceMap.begin();
while (itr != g_DeviceMap.end())
{ {
if (itr->second->IsHardware()) if (entry.second->IsHardware())
{ {
itr->second->DoState(p); entry.second->DoState(p);
} }
++itr;
} }
if (p.GetMode() == PointerWrap::MODE_READ) if (p.GetMode() == PointerWrap::MODE_READ)
{ {
u32 i; for (u32 i=0; i<IPC_MAX_FDS; i++)
for (i=0; i<IPC_MAX_FDS; i++)
{ {
u32 exists = 0; u32 exists = 0;
p.Do(exists); p.Do(exists);
@ -309,7 +298,8 @@ void DoState(PointerWrap &p)
g_FdMap[i] = NULL; g_FdMap[i] = NULL;
} }
} }
for (i=0; i<ES_MAX_COUNT; i++)
for (u32 i=0; i<ES_MAX_COUNT; i++)
{ {
p.Do(es_inuse[i]); p.Do(es_inuse[i]);
u32 handleID = es_handles[i]->GetDeviceID(); u32 handleID = es_handles[i]->GetDeviceID();
@ -320,8 +310,7 @@ void DoState(PointerWrap &p)
} }
else else
{ {
u32 i; for (u32 i=0; i<IPC_MAX_FDS; i++)
for (i=0; i<IPC_MAX_FDS; i++)
{ {
u32 exists = g_FdMap[i] ? 1 : 0; u32 exists = g_FdMap[i] ? 1 : 0;
p.Do(exists); p.Do(exists);
@ -340,7 +329,8 @@ void DoState(PointerWrap &p)
} }
} }
} }
for (i=0; i<ES_MAX_COUNT; i++)
for (u32 i=0; i<ES_MAX_COUNT; i++)
{ {
p.Do(es_inuse[i]); p.Do(es_inuse[i]);
u32 handleID = es_handles[i]->GetDeviceID(); u32 handleID = es_handles[i]->GetDeviceID();
@ -370,7 +360,6 @@ void ExecuteCommand(u32 _Address)
std::string DeviceName; std::string DeviceName;
Memory::GetString(DeviceName, Memory::Read_U32(_Address + 0xC)); Memory::GetString(DeviceName, Memory::Read_U32(_Address + 0xC));
WARN_LOG(WII_IPC_HLE, "Trying to open %s as %d", DeviceName.c_str(), DeviceID); WARN_LOG(WII_IPC_HLE, "Trying to open %s as %d", DeviceName.c_str(), DeviceID);
if (DeviceID >= 0) if (DeviceID >= 0)
{ {
@ -388,12 +377,12 @@ void ExecuteCommand(u32 _Address)
break; break;
} }
} }
if (j == ES_MAX_COUNT) if (j == ES_MAX_COUNT)
{ {
Memory::Write_U32(FS_EESEXHAUSTED, _Address + 4); Memory::Write_U32(FS_EESEXHAUSTED, _Address + 4);
CmdSuccess = true; CmdSuccess = true;
} }
} }
else if (DeviceName.find("/dev/") == 0) else if (DeviceName.find("/dev/") == 0)
{ {
@ -430,7 +419,6 @@ void ExecuteCommand(u32 _Address)
pDevice = NULL; pDevice = NULL;
} }
} }
} }
else else
{ {
@ -445,8 +433,7 @@ void ExecuteCommand(u32 _Address)
{ {
CmdSuccess = pDevice->Close(_Address); CmdSuccess = pDevice->Close(_Address);
u32 j; for (u32 j=0; j<ES_MAX_COUNT; j++)
for (j=0; j<ES_MAX_COUNT; j++)
{ {
if (es_handles[j] == g_FdMap[DeviceID]) if (es_handles[j] == g_FdMap[DeviceID])
{ {